Fix ~3500 analyser issues

See merge request ryubing/ryujinx!44

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -1,4 +1,4 @@
-using LibHac.Common;
+using LibHac.Common;
 using LibHac.Ncm;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem.NcaUtils;
@@ -38,17 +38,17 @@ namespace Ryujinx.Ava.Utilities
             out BlitStruct<ApplicationControlProperty> appControl)
         {
             contentManager ??= _contentManager;
-            if (contentManager == null) 
+            if (contentManager == null)
                 goto BadData;
 
             string contentPath = GetContentPath(contentManager);
-            if (string.IsNullOrEmpty(contentPath)) 
+            if (string.IsNullOrEmpty(contentPath))
                 goto BadData;
 
             appData = new() { Name = Name, Id = ProgramId, Path = contentPath };
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;
-            
+
         BadData:
             appData = null;
             appControl = new BlitStruct<ApplicationControlProperty>(0);

src/Ryujinx/Utilities/CommandLineState.cs

@@ -14,9 +14,9 @@ namespace Ryujinx.Ava.Utilities
         public static string OverrideBackendThreading { get; private set; }
         public static string OverrideBackendThreadingAfterReboot { get; private set; }
         public static string OverridePPTC { get; private set; }
-        public static string OverrideMemoryManagerMode { get; private set; } 
-        public static string OverrideSystemRegion { get; private set; } 
-        public static string OverrideSystemLanguage { get; private set; } 
+        public static string OverrideMemoryManagerMode { get; private set; }
+        public static string OverrideSystemRegion { get; private set; }
+        public static string OverrideSystemLanguage { get; private set; }
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
         public static FilePath FirmwareToInstallPathArg { get; set; }
@@ -26,7 +26,6 @@ namespace Ryujinx.Ava.Utilities
         public static bool StartFullscreenArg { get; private set; }
         public static bool HideAvailableUpdates { get; private set; }
 
-
         public static void ParseArguments(string[] args)
         {
             List<string> arguments = [];
@@ -36,9 +35,9 @@ namespace Ryujinx.Ava.Utilities
             {
                 string arg = args[i];
 
-                if (arg.Contains("-") || arg.Contains("--"))
+                if (arg.Contains('-') || arg.Contains("--"))
                 {
-                    CountArguments++; 
+                    CountArguments++;
                 }
 
                 switch (arg)

src/Ryujinx/Utilities/SetupValidator.cs

@@ -31,7 +31,7 @@ namespace Ryujinx.Ava.Utilities
                 firmwareVersion = null;
             }
 
-            return error == UserError.NoFirmware && Path.GetExtension(baseApplicationPath).ToLowerInvariant() == ".xci" && firmwareVersion != null;
+            return error == UserError.NoFirmware && Path.GetExtension(baseApplicationPath).Equals(".xci", StringComparison.OrdinalIgnoreCase) && firmwareVersion != null;
         }
 
         public static bool TryFixStartApplication(ContentManager contentManager, string baseApplicationPath, UserError error, out UserError outError)
@@ -94,7 +94,7 @@ namespace Ryujinx.Ava.Utilities
                     error = UserError.Success;
                     return true;
                 }
-                
+
                 return IsFirmwareValid(contentManager, out error);
             }
 

src/Ryujinx/Utilities/StorageProviderExtensions.cs

@@ -1,4 +1,4 @@
-using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage;
 using Gommon;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Utilities
         public static async Task<Optional<IStorageFile>> OpenSingleFilePickerAsync(this IStorageProvider storageProvider, FilePickerOpenOptions openOptions = null) =>
             await storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, false))
                 .Then(files => files.FindFirst());
-        
+
         public static async Task<Optional<IReadOnlyList<IStorageFolder>>> OpenMultiFolderPickerAsync(this IStorageProvider storageProvider, FolderPickerOpenOptions openOptions = null) =>
             await storageProvider.OpenFolderPickerAsync(FixOpenOptions(openOptions, true))
                 .Then(folders => folders.Count > 0 ? Optional.Of(folders) : default);
@@ -23,24 +23,24 @@ namespace Ryujinx.Ava.Utilities
         public static async Task<Optional<IReadOnlyList<IStorageFile>>> OpenMultiFilePickerAsync(this IStorageProvider storageProvider, FilePickerOpenOptions openOptions = null) =>
             await storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, true))
                 .Then(files => files.Count > 0 ? Optional.Of(files) : default);
-        
+
         private static FilePickerOpenOptions FixOpenOptions(this FilePickerOpenOptions openOptions, bool allowMultiple)
         {
             if (openOptions is null)
                 return new FilePickerOpenOptions { AllowMultiple = allowMultiple };
 
             openOptions.AllowMultiple = allowMultiple;
-            
+
             return openOptions;
         }
-        
+
         private static FolderPickerOpenOptions FixOpenOptions(this FolderPickerOpenOptions openOptions, bool allowMultiple)
         {
             if (openOptions is null)
                 return new FolderPickerOpenOptions { AllowMultiple = allowMultiple };
 
             openOptions.AllowMultiple = allowMultiple;
-            
+
             return openOptions;
         }
     }

src/Ryujinx/Utilities/TitleHelper.cs

@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.Utilities
             string titleIdSection = $" ({activeProcess.ProgramIdText.ToUpper()})";
             string titleArchSection = activeProcess.Is64Bit ? " (64-bit)" : " (32-bit)";
 
-            string appTitle = customTitlebar 
+            string appTitle = customTitlebar
                 ? $"Ryujinx {applicationVersion}\n{titleNameSection.Trim()}\n{titleVersionSection.Trim()}\n{titleIdSection.Trim()}{titleArchSection}"
                 : $"Ryujinx {applicationVersion} -{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
 

src/Ryujinx/Utilities/ValueFormatUtils.cs

@@ -51,22 +51,22 @@ namespace Ryujinx.Ava.Utilities
         {
             if (!timeSpan.HasValue || timeSpan.Value.TotalSeconds < 1)
                 return string.Empty;
-            
+
             if (timeSpan.Value.TotalSeconds < 60)
-                return timeSpan.Value.Humanize(1, 
-                    countEmptyUnits: false, 
+                return timeSpan.Value.Humanize(1,
+                    countEmptyUnits: false,
                     maxUnit: TimeUnit.Second,
                     minUnit: TimeUnit.Second);
 
             if (timeSpan.Value.TotalMinutes < 60)
-                return timeSpan.Value.Humanize(1, 
-                    countEmptyUnits: false, 
+                return timeSpan.Value.Humanize(1,
+                    countEmptyUnits: false,
                     maxUnit: TimeUnit.Minute,
                     minUnit: TimeUnit.Minute);
-            
-            return timeSpan.Value.Humanize(1, 
-                countEmptyUnits: false, 
-                maxUnit: TimeUnit.Hour, 
+
+            return timeSpan.Value.Humanize(1,
+                countEmptyUnits: false,
+                maxUnit: TimeUnit.Hour,
                 minUnit: TimeUnit.Hour);
         }