aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-06-28 18:41:38 +0200
committerGitHub <noreply@github.com>2023-06-28 18:41:38 +0200
commitfc20d9b925b83532a19467293a7cdcbaa4ef3d6b (patch)
treeebe0e690b6644d0f825ee80f20e4067855f35cf4 /src/Ryujinx.Common/Utilities/EmbeddedResources.cs
parent0a75b73fa43ddadf561ddeb0f923c6f3811c025b (diff)
[Ryujinx.Common] Address dotnet-format issues (#5358)
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2211 warnings * Silence CA1806 and CA1834 issues * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Replace MmeShadowScratch with Array256<uint> * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Second dotnet format pass * Fix build issues * Fix StructArrayHelpers.cs * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Fix return statements * Fix naming rule violations * Update src/Ryujinx.Common/Utilities/StreamUtils.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Add trailing commas * Address review feedback * Address review feedback * Rename remaining type parameters to TKey and TValue * Fix manual formatting for logging levels * Fix spacing before comments --------- Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.Common/Utilities/EmbeddedResources.cs')
-rw-r--r--src/Ryujinx.Common/Utilities/EmbeddedResources.cs69
1 files changed, 28 insertions, 41 deletions
diff --git a/src/Ryujinx.Common/Utilities/EmbeddedResources.cs b/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
index 22b55f16..a4facc2e 100644
--- a/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
+++ b/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common.Memory;
using Ryujinx.Common.Utilities;
using System;
using System.IO;
@@ -10,11 +9,11 @@ namespace Ryujinx.Common
{
public static class EmbeddedResources
{
- private readonly static Assembly ResourceAssembly;
+ private readonly static Assembly _resourceAssembly;
static EmbeddedResources()
{
- ResourceAssembly = Assembly.GetAssembly(typeof(EmbeddedResources));
+ _resourceAssembly = Assembly.GetAssembly(typeof(EmbeddedResources));
}
public static byte[] Read(string filename)
@@ -33,28 +32,24 @@ namespace Ryujinx.Common
public static byte[] Read(Assembly assembly, string filename)
{
- using (var stream = GetStream(assembly, filename))
+ using var stream = GetStream(assembly, filename);
+ if (stream == null)
{
- if (stream == null)
- {
- return null;
- }
-
- return StreamUtils.StreamToBytes(stream);
+ return null;
}
+
+ return StreamUtils.StreamToBytes(stream);
}
public async static Task<byte[]> ReadAsync(Assembly assembly, string filename)
{
- using (var stream = GetStream(assembly, filename))
+ using var stream = GetStream(assembly, filename);
+ if (stream == null)
{
- if (stream == null)
- {
- return null;
- }
-
- return await StreamUtils.StreamToBytesAsync(stream);
+ return null;
}
+
+ return await StreamUtils.StreamToBytesAsync(stream);
}
public static string ReadAllText(string filename)
@@ -73,34 +68,26 @@ namespace Ryujinx.Common
public static string ReadAllText(Assembly assembly, string filename)
{
- using (var stream = GetStream(assembly, filename))
+ using var stream = GetStream(assembly, filename);
+ if (stream == null)
{
- if (stream == null)
- {
- return null;
- }
-
- using (var reader = new StreamReader(stream))
- {
- return reader.ReadToEnd();
- }
+ return null;
}
+
+ using var reader = new StreamReader(stream);
+ return reader.ReadToEnd();
}
public async static Task<string> ReadAllTextAsync(Assembly assembly, string filename)
{
- using (var stream = GetStream(assembly, filename))
+ using var stream = GetStream(assembly, filename);
+ if (stream == null)
{
- if (stream == null)
- {
- return null;
- }
-
- using (var reader = new StreamReader(stream))
- {
- return await reader.ReadToEndAsync();
- }
+ return null;
}
+
+ using var reader = new StreamReader(stream);
+ return await reader.ReadToEndAsync();
}
public static Stream GetStream(string filename)
@@ -112,8 +99,8 @@ namespace Ryujinx.Common
public static Stream GetStream(Assembly assembly, string filename)
{
- var namespace_ = assembly.GetName().Name;
- var manifestUri = namespace_ + "." + filename.Replace('/', '.');
+ var @namespace = assembly.GetName().Name;
+ var manifestUri = @namespace + "." + filename.Replace('/', '.');
var stream = assembly.GetManifestResourceStream(manifestUri);
@@ -142,7 +129,7 @@ namespace Ryujinx.Common
}
}
- return (ResourceAssembly, filename);
+ return (_resourceAssembly, filename);
}
}
-} \ No newline at end of file
+}