Merge #4176 Avoid index out of range

KSP-CKAN · Sep 7, 2024 · bc7b390 · bc7b390
2 parents 3f578cc + 8e7d6c4
commit bc7b390
Show file tree

Hide file tree

Showing 61 changed files with 466 additions and 292 deletions.
diff --git a/AutoUpdate/CKAN-autoupdate.csproj b/AutoUpdate/CKAN-autoupdate.csproj
@@ -33,6 +33,8 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
+    <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
+    <PackageReference Include="IndexRange" Version="1.0.3" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\_build\meta\GlobalAssemblyVersionInfo.cs">

diff --git a/AutoUpdate/Main.cs b/AutoUpdate/Main.cs
@@ -28,18 +28,22 @@ public static int Main(string[] args)
         {
             AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionEventHandler;
 
-            if (args.Length != 4)
+            if (//args is not [string pid_str,
+                //             string local_path,
+                //             string updated_path,
+                //             string launch and ("launch" or "nolaunch")]
+                args.Length < 4
+                    || args[0] is not string pid_str
+                    || args[1] is not string local_path
+                    || args[2] is not string updated_path
+                    || args[3] is not (string launch and ("launch" or "nolaunch")))
             {
-                ReportError("{0}: AutoUpdater.exe pid oldPath newPath [no]launch", Properties.Resources.Usage);
+                ReportError("{0}: AutoUpdater.exe pid oldPath newPath [no]launch",
+                            Properties.Resources.Usage);
                 return ExitBADOPT;
             }
-
-            // Yes, it's a global variable, but we're an ephemeral singleton so :shrug:
-            fromGui = (args[3] == "launch");
-
-            int    pid          = int.Parse(args[0]);
-            string local_path   = args[1];
-            string updated_path = args[2];
+            int pid = int.Parse(pid_str);
+            fromGui = (launch == "launch");
 
             if (!File.Exists(updated_path))
             {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -79,7 +79,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Autogenerate `spec_version` and make it optional in netkans (#4155 by: HebaruSan)
 - [Infra] Trigger mod installer deploy after APT repo update (#4158 by: HebaruSan)
 - [CLI] Ability to update repos without a game instance (#4161 by: HebaruSan)
-- [Multiple] Nullable references, net8.0, blend registry alert dot, netkan fixes (#4171 by: HebaruSan)
+- [Multiple] Nullable references, net8.0, blend registry alert dot, netkan fixes (#4171, #4176 by: HebaruSan)
 - [Netkan] SourceForge kref (#4172, #4174 by: HebaruSan)
 
 ## v1.34.4 (Niven)

diff --git a/Cmdline/Action/Import.cs b/Cmdline/Action/Import.cs
@@ -53,7 +53,7 @@ public int RunCommand(CKAN.GameInstance instance, object options)
                     var toInstall = new List<CkanModule>();
                     var installer = new ModuleInstaller(instance, manager.Cache, user);
                     var regMgr    = RegistryManager.Instance(instance, repoData);
-                    installer.ImportFiles(toImport, user, mod => toInstall.Add(mod), regMgr.registry, !opts?.Headless ?? false);
+                    installer.ImportFiles(toImport, user, toInstall.Add, regMgr.registry, !opts?.Headless ?? false);
                     if (toInstall.Count > 0)
                     {
                         HashSet<string>? possibleConfigOnlyDirs = null;

diff --git a/Cmdline/Action/Show.cs b/Cmdline/Action/Show.cs
@@ -76,13 +76,15 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
                         user.RaiseMessage("");
                         continue;
                     }
-                    else if (matches.Count() == 1)
+                    else if (//matches is [CkanModule oneMod]
+                             matches.Count == 1
+                             && matches[0] is CkanModule oneMod)
                     {
                         // If there is only 1 match, display it.
-                        user.RaiseMessage(Properties.Resources.ShowFoundOne, matches[0].name);
+                        user.RaiseMessage(Properties.Resources.ShowFoundOne, oneMod.name);
                         user.RaiseMessage("");
 
-                        moduleToShow = matches[0];
+                        moduleToShow = oneMod;
                     }
                     else
                     {
@@ -281,10 +283,14 @@ private int ShowMod(CkanModule module, ShowOptions opts)
                               module.resources.remoteSWInfo);
             }
 
-            if (!opts.without_files && !module.IsDLC)
+            if (!opts.without_files && !module.IsDLC
+                //&& module.download is [Uri url, ..]
+                && module.download != null
+                && module.download.Count > 0
+                && module.download[0] is Uri url)
             {
                 // Compute the CKAN filename.
-                string file_uri_hash = NetFileCache.CreateURLHash(module.download?[0]);
+                string file_uri_hash = NetFileCache.CreateURLHash(url);
                 string file_name = CkanModule.StandardName(module.identifier, module.version);
 
                 user.RaiseMessage("");
@@ -313,35 +319,28 @@ private void ShowVersionTable(CKAN.GameInstance inst, List<CkanModule> modules)
             var versions     = modules.Select(m => m.version.ToString()).ToList();
             var gameVersions = modules.Select(m =>
             {
-                CkanModule.GetMinMaxVersions(new List<CkanModule>() { m }, out _, out _, out GameVersion? minKsp, out GameVersion? maxKsp);
+                CkanModule.GetMinMaxVersions(new List<CkanModule>() { m }, out _, out _,
+                                             out GameVersion? minKsp, out GameVersion? maxKsp);
                 return GameVersionRange.VersionSpan(inst.game,
                                                     minKsp ?? GameVersion.Any,
                                                     maxKsp ?? GameVersion.Any);
             }).ToList();
-            string[] headers = new string[] {
-                Properties.Resources.ShowVersionHeader,
-                Properties.Resources.ShowGameVersionsHeader
-            };
-            int versionLength     = Math.Max(headers[0].Length, versions.Max(v => v.Length));
-            int gameVersionLength = Math.Max(headers[1].Length, gameVersions.Max(v => v.Length));
+            int versionLength     = Math.Max(Properties.Resources.ShowVersionHeader.Length,
+                                             versions.Max(v => v.Length));
+            int gameVersionLength = Math.Max(Properties.Resources.ShowGameVersionsHeader.Length,
+                                             gameVersions.Max(v => v.Length));
             user.RaiseMessage("");
-            user.RaiseMessage(
-                "{0}  {1}",
-                headers[0].PadRight(versionLength),
-                headers[1].PadRight(gameVersionLength)
-            );
-            user.RaiseMessage(
-                "{0}  {1}",
-                new string('-', versionLength),
-                new string('-', gameVersionLength)
-            );
+            user.RaiseMessage("{0}  {1}",
+                              Properties.Resources.ShowVersionHeader.PadRight(versionLength),
+                              Properties.Resources.ShowGameVersionsHeader.PadRight(gameVersionLength));
+            user.RaiseMessage("{0}  {1}",
+                              new string('-', versionLength),
+                              new string('-', gameVersionLength));
             for (int row = 0; row < versions.Count; ++row)
             {
-                user.RaiseMessage(
-                    "{0}  {1}",
-                    versions[row].PadRight(versionLength),
-                    gameVersions[row].PadRight(gameVersionLength)
-                );
+                user.RaiseMessage("{0}  {1}",
+                                  versions[row].PadRight(versionLength),
+                                  gameVersions[row].PadRight(gameVersionLength));
             }
         }
 

diff --git a/Cmdline/Action/Upgrade.cs b/Cmdline/Action/Upgrade.cs
@@ -55,7 +55,12 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
                 return Exit.BADOPT;
             }
 
-            if (!options.upgrade_all && options.modules?[0] == "ckan" && AutoUpdate.CanUpdate)
+            if (!options.upgrade_all
+                //&& options.modules is ["ckan"]
+                && options.modules != null
+                && options.modules.Count > 0
+                && options.modules[0] is "ckan"
+                && AutoUpdate.CanUpdate)
             {
                 if (options.dev_build && options.stable_release)
                 {
@@ -196,7 +201,7 @@ private void UpgradeModules(NetModuleCache      cache,
                     installer.Upgrade(modules, downloader,
                                       ref possibleConfigOnlyDirs,
                                       regMgr, true, true, true),
-                m => modules.Add(m));
+                modules.Add);
         }
 
         /// <summary>

diff --git a/Cmdline/ConsoleUser.cs b/Cmdline/ConsoleUser.cs
@@ -105,7 +105,9 @@ public int RaiseSelectionDialog(string message, params object[] args)
             // Check if we have a default selection.
             int defaultSelection = -1;
 
-            if (args[0] is int v)
+            if (//args is [int v, ..]
+                args.Length > 0
+                && args[0] is int v)
             {
                 // Check that the default selection makes sense.
                 defaultSelection = v;

diff --git a/Cmdline/Main.cs b/Cmdline/Main.cs
@@ -87,32 +87,35 @@ public static int Execute(GameInstanceManager? manager, CommonOptions? opts, str
             // It breaks command-specific help, for starters.
             try
             {
-                switch (args[0])
+                if (args.Length > 0)
                 {
-                    case "repair":
-                        return (new Repair(repoData)).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                    switch (args[0])
+                    {
+                        case "repair":
+                            return (new Repair(repoData)).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
-                    case "instance":
-                        return (new GameInstance()).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                        case "instance":
+                            return (new GameInstance()).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
-                    case "compat":
-                        return (new Compat()).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                        case "compat":
+                            return (new Compat()).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
-                    case "repo":
-                        return (new Repo(repoData)).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                        case "repo":
+                            return (new Repo(repoData)).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
-                    case "authtoken":
-                        return (new AuthToken()).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                        case "authtoken":
+                            return (new AuthToken()).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
-                    case "cache":
-                        return (new Cache()).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                        case "cache":
+                            return (new Cache()).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
-                    case "mark":
-                        return (new Mark(repoData)).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                        case "mark":
+                            return (new Mark(repoData)).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
-                    case "filter":
-                        return (new Filter()).RunSubCommand(manager, opts, new SubCommandOptions(args));
+                        case "filter":
+                            return (new Filter()).RunSubCommand(manager, opts, new SubCommandOptions(args));
 
+                    }
                 }
             }
             catch (NoGameInstanceKraken)

diff --git a/ConsoleUI/Toolkit/ConsoleFileMultiSelectDialog.cs b/ConsoleUI/Toolkit/ConsoleFileMultiSelectDialog.cs
@@ -73,7 +73,7 @@ public ConsoleFileMultiSelectDialog(ConsoleTheme theme,
                         getRowName, compareNames, null),
                     new ConsoleListBoxColumn<FileSystemInfo>(
                         Properties.Resources.FileSelectSizeHeader,
-                        (FileSystemInfo fi) => getLength(fi),
+                        getLength,
                         (a, b) => {
                             var fb = b as FileInfo;
                             return a is not FileInfo fa

diff --git a/ConsoleUI/Toolkit/Symbols.cs b/ConsoleUI/Toolkit/Symbols.cs
@@ -145,7 +145,12 @@ private static Encoding GetCodePage(int which)
         /// </summary>
         public static readonly char leftHalfBlock = cp437c(0xdd);
 
-        private static char   cp437c(byte num) => dosCodePage.GetChars(new byte[] {num})[0];
+        private static char   cp437c(byte num) => //dosCodePage.GetChars(new byte[] {num}) is [char val]
+                                                  dosCodePage.GetChars(new byte[] {num}) is char[] chars
+                                                  && chars.Length > 0
+                                                  && chars[0] is char val
+                                                      ? val
+                                                      : (char)0;
         private static string cp437s(byte num) => $"{cp437c(num)}";
     }
 

diff --git a/Core/AutoUpdate/GithubReleaseCkanUpdate.cs b/Core/AutoUpdate/GithubReleaseCkanUpdate.cs
@@ -85,8 +85,21 @@ internal static string ExtractReleaseNotes(string releaseBody)
         {
             const string divider = "\r\n---\r\n";
             // Get at most two pieces, the first is the image, the second is the release notes
-            string[] notesArray = releaseBody.Split(new string[] { divider }, 2, StringSplitOptions.None);
-            return notesArray.Length > 1 ? notesArray[1] : notesArray[0];
+            //return releaseBody.Split(new string[] { divider },
+            //                         2, StringSplitOptions.None) switch {
+            //    [_, string val, ..] => val,
+            //    [string val]        => val,
+            //    _                   => "",
+            //};
+            var array = releaseBody.Split(new string[] { divider },
+                                          2, StringSplitOptions.None);
+            return array.Length > 1
+                   && array[1] is string val
+                       ? val
+                       : array.Length == 1
+                         && array[0] is string val2
+                             ? val2
+                             : "";
         }
 
         private static readonly Uri latestCKANReleaseApiUrl =

diff --git a/Core/Converters/JsonSingleOrArrayConverter.cs b/Core/Converters/JsonSingleOrArrayConverter.cs
@@ -28,8 +28,12 @@ public class JsonSingleOrArrayConverter<T> : JsonConverter
 
         public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
-            var list = value as List<T>;
-            serializer.Serialize(writer, list?.Count == 1 ? list[0] : value);
+            serializer.Serialize(writer, //value is List<T> and [T val]
+                                         value is List<T> list
+                                         && list.Count == 1
+                                         && list[0] is T val
+                                             ? val
+                                             : value);
         }
 
         /// <summary>

diff --git a/Core/Converters/JsonToGamesDictionaryConverter.cs b/Core/Converters/JsonToGamesDictionaryConverter.cs
@@ -57,8 +57,11 @@ public class JsonToGamesDictionaryConverter : JsonConverter
             {
                 return token.ToObject(objectType);
             }
-            var valueType = objectType.GetGenericArguments()[1];
-            if (Activator.CreateInstance(objectType) is IDictionary obj
+            if (//objectType.GetGenericArguments() is [_, var valueType, ..]
+                objectType.GetGenericArguments() is Type[] types
+                && types.Length > 0
+                && types[1] is var valueType
+                && Activator.CreateInstance(objectType) is IDictionary obj
                 && !IsTokenEmpty(token))
             {
                 foreach (var gameName in KnownGames.AllGameShortNames())

diff --git a/Core/Exporters/DelimiterSeparatedValueExporter.cs b/Core/Exporters/DelimiterSeparatedValueExporter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Collections.Generic;
 
 namespace CKAN.Exporters
 {
@@ -53,7 +54,7 @@ public void Export(RegistryManager manager, IRegistryQuerier registry, Stream st
                                                  QuoteIfNecessary(mod.Module.description),
                                                  QuoteIfNecessary(mod.Module.author == null ? "" : string.Join(";", mod.Module.author)),
                                                  QuoteIfNecessary(mod.Module.kind),
-                                                 WriteUri(mod.Module.download?[0]),
+                                                 WriteUri(mod.Module.download),
                                                  mod.Module.download_size,
                                                  mod.Module.ksp_version,
                                                  mod.Module.ksp_version_min,
@@ -71,9 +72,16 @@ public void Export(RegistryManager manager, IRegistryQuerier registry, Stream st
         }
 
         private string WriteUri(Uri? uri)
-            => uri != null
-                ? QuoteIfNecessary(uri.ToString())
-                : string.Empty;
+            => uri != null ? QuoteIfNecessary(uri.ToString())
+                           : string.Empty;
+
+        private string WriteUri(List<Uri>? uris)
+            => WriteUri(//uris is [Uri uri, ..]
+                        uris != null
+                        && uris.Count > 0
+                        && uris[0] is Uri uri
+                            ? uri
+                            : null);
 
         private string WriteRepository(ResourcesDescriptor? resources)
             => resources != null && resources.repository != null

diff --git a/Core/Extensions/DictionaryExtensions.cs b/Core/Extensions/DictionaryExtensions.cs
@@ -9,7 +9,7 @@ public static bool DictionaryEquals<K, V>(this IDictionary<K, V>? a,
                                                   IDictionary<K, V>?      b)
             => a == null ? b == null
                          : b != null && a.Count == b.Count
-                           && a.Keys.All(k => b.ContainsKey(k))
+                           && a.Keys.All(b.ContainsKey)
                            && b.Keys.All(k => a.ContainsKey(k)
                                               && EqualityComparer<V>.Default.Equals(a[k], b[k]));
 

diff --git a/Core/Extensions/EnumExtensions.cs b/Core/Extensions/EnumExtensions.cs
@@ -7,7 +7,7 @@ public static class EnumExtensions
     {
 
         public static bool HasAnyFlag(this Enum val, params Enum[] flags)
-            => flags.Any(f => val.HasFlag(f));
+            => flags.Any(val.HasFlag);
 
     }
 }