Small Code QA

Author: neon-nyan

CollapseLauncher/Classes/InstallManagement/Base/InstallManagerBase.cs

@@ -65,7 +65,6 @@
 using ZipArchive = SharpCompress.Archives.Zip.ZipArchive;
 using ZipArchiveEntry = SharpCompress.Archives.Zip.ZipArchiveEntry;
 // ReSharper disable SwitchStatementMissingSomeEnumCasesNoDefault
-#pragma warning disable CS8777 // Parameter must have a non-null value when exiting.
 #endif
 
 // ReSharper disable ForCanBeConvertedToForeach
@@ -2139,15 +2138,15 @@ protected virtual int GetIDByLanguageLocaleCode([NotNull] string? localeCode)
                    };
         }
 
-        protected virtual string GetLanguageStringByLocaleCode([NotNull] string? localeCode, bool throwIfInvalid =
+        protected virtual string GetLanguageStringByLocaleCode(string? localeCode, bool throwIfInvalid =
 #if DEBUG
             true
 #else
             false
 #endif
             ) => GetLanguageStringByLocaleCodeStatic(localeCode, throwIfInvalid);
 
-        internal static string GetLanguageStringByLocaleCodeStatic([NotNull] string? localeCode, bool throwIfInvalid =
+        internal static string GetLanguageStringByLocaleCodeStatic(string? localeCode, bool throwIfInvalid =
 #if DEBUG
             true
 #else

CollapseLauncher/Classes/RepairManagement/Genshin/Fetch.cs

@@ -197,116 +197,6 @@ await GenshinInstall.DownloadPkgVersionStatic(httpClient,
         }
 #nullable restore
 
-/*
-        private async Task BuildPrimaryManifestOld(DownloadClient                           downloadClient,
-                                                   DownloadProgressDelegate                 downloadProgress,
-                                                   List<PkgVersionProperties>               assetIndex,
-                                                   Dictionary<string, PkgVersionProperties> hashtableManifest,
-                                                   CancellationToken                        token)
-        {
-            try
-            {
-                // Try Cleanup Download Profile file
-                TryDeleteDownloadPref();
-
-                // Build basic file entry.
-                string manifestPath = Path.Combine(GamePath, "pkg_version");
-
-                // Download basic package version list
-                var basicVerURL = CombineURLFromString(GameRepoURL, "pkg_version");
-#if DEBUG
-                LogWriteLine($"Downloading pkg_version...\r\n\t{basicVerURL}", LogType.Debug, true);
-#endif
-                await downloadClient.DownloadAsync(
-                    basicVerURL,
-                    EnsureCreationOfDirectory(manifestPath),
-                    true,
-                    progressDelegateAsync: downloadProgress,
-                    maxConnectionSessions: DownloadThreadCount,
-                    cancelToken: token
-                    );
-
-                // Download additional package lists
-                var dataVerPath = $@"{ExecPrefix}_Data\StreamingAssets\data_versions_streaming";
-                var dataVerURL = CombineURLFromString(GameRepoURL, dataVerPath);
-#if DEBUG
-                LogWriteLine($"Downloading data_versions_streaming...\r\n\t{dataVerURL}", LogType.Debug, true);
-#endif
-                await downloadClient.DownloadAsync(
-                    dataVerURL,
-                    EnsureCreationOfDirectory(Path.Combine(GamePath, dataVerPath)),
-                    true,
-                    progressDelegateAsync: downloadProgress,
-                    maxConnectionSessions: DownloadThreadCount,
-                    cancelToken: token
-                    );
-
-                var silenceVerPath = $@"{ExecPrefix}_Data\StreamingAssets\silence_versions_streaming";
-                var silenceVerURL = CombineURLFromString(GameRepoURL, silenceVerPath);
-#if DEBUG
-                LogWriteLine($"Downloading silence_versions_streaming...\r\n\t{silenceVerURL}", LogType.Debug, true);
-#endif
-                await downloadClient.DownloadAsync(
-                    silenceVerURL,
-                    EnsureCreationOfDirectory(Path.Combine(GamePath, silenceVerPath)),
-                    true,
-                    progressDelegateAsync: downloadProgress,
-                    maxConnectionSessions: DownloadThreadCount,
-                    cancelToken: token
-                    );
-
-                var resVerPath = $@"{ExecPrefix}_Data\StreamingAssets\res_versions_streaming";
-                var resVerURL = CombineURLFromString(GameRepoURL, resVerPath);
-#if DEBUG
-                LogWriteLine($"Downloading res_versions_streaming...\r\n\t{resVerURL}", LogType.Debug, true);
-#endif
-                await downloadClient.DownloadAsync(
-                    resVerURL,
-                    EnsureCreationOfDirectory(Path.Combine(GamePath, resVerPath)),
-                    true,
-                    progressDelegateAsync: downloadProgress,
-                    maxConnectionSessions: DownloadThreadCount,
-                    cancelToken: token
-                    );
-
-                var videoVerPath = $@"{ExecPrefix}_Data\StreamingAssets\VideoAssets\video_versions_streaming";
-                var videoVerURL = CombineURLFromString(GameRepoURL, videoVerPath);
-#if DEBUG
-                LogWriteLine($"Downloading video_versions_streaming...\r\n\t{videoVerURL}", LogType.Debug, true);
-#endif
-                await downloadClient.DownloadAsync(
-                    videoVerURL,
-                    EnsureCreationOfDirectory(Path.Combine(GamePath, videoVerPath)),
-                    true,
-                    progressDelegateAsync: downloadProgress,
-                    maxConnectionSessions: DownloadThreadCount,
-                    cancelToken: token
-                    );
-
-                // Parse basic package version.
-                var streamingAssetsPath = $@"{ExecPrefix}_Data\StreamingAssets";
-                ParseManifestToAssetIndex(manifestPath, "", assetIndex, hashtableManifest, GameRepoURL, true);
-
-                // Build additional blks entry.
-                EnumerateManifestToAssetIndex(streamingAssetsPath, streamingAssetsPath, "data_versions_*", assetIndex, hashtableManifest,
-                    GameRepoURL, true);
-                EnumerateManifestToAssetIndex(streamingAssetsPath, streamingAssetsPath, "silence_versions_*", assetIndex, hashtableManifest,
-                    GameRepoURL, true);
-                EnumerateManifestToAssetIndex(streamingAssetsPath, streamingAssetsPath, "res_versions_*", assetIndex, hashtableManifest,
-                    GameRepoURL, true);
-
-                // Build cutscenes entry.
-                EnumerateManifestToAssetIndex(streamingAssetsPath, streamingAssetsPath, "VideoAssets\\*_versions_*", assetIndex, hashtableManifest,
-                    GameRepoURL, true);
-            }
-            catch (Exception ex)
-            {
-                LogWriteLine($"Parsing primary manifest has failed!\r\n{ex}", LogType.Error, true);
-                ErrorSender.SendException(ex);
-            }
-        }
-*/
-
         private void TryDeleteDownloadPref()
         {
             // Get the paths