Senadina Repair/Delta/Cache Compatibility Fix by @neon-nyan (#408)

* Add ``CastAs<T>()`` extension to ``IGameVersionCheck`` * Adding initial adjustment * Implement Identifier getter * Add temporary fix for Delta-patch * Adjust changes based on Senadina changes + We are now using our backend service to provide information needed for repair process. * Remove test codes * Fix unexpected size and wrong file selected on CG * ISTG, SHAAAPPHHH + Fix corresponding path for the language based CG * Use new OOBE UI widely and fix some issue * Ignore ``FBData`` on cache check * (Qodana) Ignore "ThisAssembly.Constants" license check Why does it suddenly lost its license file? i dunno * (CodeQA) Fix problems in ProgressBase and HonkaiRepair::Fetch --------- Co-authored-by: Kemal Setya Adhi <[email protected]>
CollapseLauncher · Mar 1, 2024 · a3228c4 · a3228c4
1 parent fddd54f
commit a3228c4
Show file tree

Hide file tree

Showing 12 changed files with 516 additions and 275 deletions.
diff --git a/CollapseLauncher/Classes/CachesManagement/Honkai/Check.cs b/CollapseLauncher/Classes/CachesManagement/Honkai/Check.cs
@@ -64,7 +64,8 @@ private void CheckUnusedAssets(List<CacheAsset> assetIndex, List<CacheAsset> ret
             {
                 if (!filePath.Contains("output_log") && !filePath.Contains("Crashes")
                  && !filePath.Contains("Verify.txt") && !filePath.Contains("APM")
-                 && !filePath.Contains("asb.dat") && !assetIndex!.Exists(x => x!.ConcatPath == filePath))
+                 && !filePath.Contains("FBData") && !filePath.Contains("asb.dat")
+                 && !assetIndex!.Exists(x => x!.ConcatPath == filePath))
                 {
                     // Increment the total found count
                     _progressTotalCountFound++;

diff --git a/CollapseLauncher/Classes/GameManagement/GameVersion/Honkai/VersionCheck.cs b/CollapseLauncher/Classes/GameManagement/GameVersion/Honkai/VersionCheck.cs
@@ -1,13 +1,21 @@
 using CollapseLauncher.Interfaces;
-using Hi3Helper.EncTool.Parser.AssetMetadata;
 using Hi3Helper.Preset;
 using Microsoft.UI.Xaml;
-using System.IO;
+using System;
 
 namespace CollapseLauncher.GameVersioning
 {
     internal class GameTypeHonkaiVersion : GameVersionBase, IGameVersionCheck
     {
+        #region Statics
+        private static Version senadinaVersion = new Version(7, 3, 0);
+        #endregion
+
+        #region Public properties
+        public bool IsCurrentSenadinaVersion { get => GameVersionAPI.ToVersion() >= senadinaVersion; }
+        public bool IsPreloadSenadinaVersion { get => GameVersionAPIPreload.HasValue ? GameVersionAPIPreload.Value.ToVersion() >= senadinaVersion : false; }
+        #endregion
+
         public GameTypeHonkaiVersion(UIElement parentUIElement, RegionResourceProp gameRegionProp, PresetConfigV2 gamePreset)
             : base(parentUIElement, gameRegionProp, gamePreset)
         {

diff --git a/CollapseLauncher/Classes/Interfaces/Class/ProgressBase.cs b/CollapseLauncher/Classes/Interfaces/Class/ProgressBase.cs
diff --git a/CollapseLauncher/Classes/Interfaces/IGameVersionCheck.cs b/CollapseLauncher/Classes/Interfaces/IGameVersionCheck.cs
@@ -5,6 +5,17 @@
 
 namespace CollapseLauncher.Interfaces
 {
+    internal static class IGameVersionCheckExtension
+    {
+        /// <summary>
+        /// Casting the IGameVersionCheck as its origin or another version class.
+        /// </summary>
+        /// <typeparam name="TCast">The type of version class to cast</typeparam>
+        /// <returns>The version class to get casted</returns>
+        internal static TCast CastAs<TCast>(this IGameVersionCheck versionCheck)
+            where TCast : GameVersionBase, IGameVersionCheck => (TCast)versionCheck;
+    }
+
     internal interface IGameVersionCheck
     {
         /// <summary>

diff --git a/CollapseLauncher/Classes/RepairManagement/Honkai/Check.cs b/CollapseLauncher/Classes/RepairManagement/Honkai/Check.cs
@@ -547,6 +547,7 @@ private void GetUnusedAssetIndexList(List<string> catalog, List<FilePropertiesRe
                 bool isIncluded = catalog.Any(x => x.Equals(asset, StringComparison.OrdinalIgnoreCase));
                 bool isScreenshot = asset.Contains("ScreenShot", StringComparison.OrdinalIgnoreCase);
                 bool isLog = asset.EndsWith(".log", StringComparison.OrdinalIgnoreCase);
+                bool isDriver = asset.EndsWith(".sys", StringComparison.OrdinalIgnoreCase);
 
                 // Configuration related
                 bool isWebcaches = asset.Contains("webCaches", StringComparison.OrdinalIgnoreCase);
@@ -580,7 +581,7 @@ private void GetUnusedAssetIndexList(List<string> catalog, List<FilePropertiesRe
                 bool isDirectX = (filename.StartsWith("d3d", StringComparison.OrdinalIgnoreCase) && asset.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
                     || filename.StartsWith("dxgi.dll", StringComparison.OrdinalIgnoreCase);
 
-                if (!isIncluded && !isIni && !isXMFBlocks && !isXMFBlocksVer && !isXMFMeta
+                if (!isIncluded && !isIni && !isDriver && !isXMFBlocks && !isXMFBlocksVer && !isXMFMeta
                     && !isVersion && !isScreenshot && !isWebcaches && !isSDKcaches && !isLog
                     && !isUSM && !isWwiseHeader && !isAudioManifest && !isBlockPatch
                     && !isDeltaPatch && !isFlags && !isZip && !isDirectX)

diff --git a/CollapseLauncher/Classes/RepairManagement/Honkai/Fetch.cs b/CollapseLauncher/Classes/RepairManagement/Honkai/Fetch.cs
diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
@@ -47,11 +47,11 @@
 		- MHYPLUGINSUPPORT : Enable miHoYo's patching system through launcher (EXPERIMENTAL)
 -->
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN;ENABLEHTTPREPAIR;DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION;PREVIEW;DUMPGIJSON;SIMULATEGIHDR;GSPBYPASSGAMERUNNING;MHYPLUGINSUPPORT;PROTOTYPEUI</DefineConstants>
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN;ENABLEHTTPREPAIR;DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION;PREVIEW;DUMPGIJSON;SIMULATEGIHDR;GSPBYPASSGAMERUNNING;MHYPLUGINSUPPORT</DefineConstants>
 		<DebugType>portable</DebugType>
   </PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN;ENABLEHTTPREPAIR;DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION;PREVIEW;MHYPLUGINSUPPORT;PROTOTYPEUI</DefineConstants>
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN;ENABLEHTTPREPAIR;DISABLE_XAML_GENERATED_BREAK_ON_UNHANDLED_EXCEPTION;PREVIEW;MHYPLUGINSUPPORT</DefineConstants>
 		<Optimize>True</Optimize>
 		<GitSkipCache>true</GitSkipCache>
 		<DebugType>portable</DebugType>

diff --git a/CollapseLauncher/XAMLs/MainApp/MainWindow.xaml.cs b/CollapseLauncher/XAMLs/MainApp/MainWindow.xaml.cs
@@ -70,11 +70,7 @@ public void InitializeWindowProperties(bool startOOBE = false)
                     SetLegacyTitleBarColor();
                     m_presenter.IsResizable = false;
                     m_presenter.IsMaximizable = false;
-#if PROTOTYPEUI
                     rootFrame.Navigate(typeof(Pages.OOBE.OOBEStartUpMenu), null, new DrillInNavigationTransitionInfo());
-#else
-                    rootFrame.Navigate(typeof(StartupLanguageSelect), null, new DrillInNavigationTransitionInfo());
-#endif
                 }
                 else
                     StartMainPage();

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/OOBE/OOBEStartUpMenu.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/OOBE/OOBEStartUpMenu.xaml
@@ -327,6 +327,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Bottom"
                     Click="NextPageButton_Click"
+                    IsEnabled="False"
                     Opacity="0"
                     Style="{ThemeResource TransparentDefaultButtonStyle}">
                     <Button.OpacityTransition>

diff --git a/Hi3Helper.EncTool b/Hi3Helper.EncTool
diff --git a/Hi3Helper.EncTool.Test/Program.cs b/Hi3Helper.EncTool.Test/Program.cs
@@ -1,12 +1,24 @@
-using Hi3Helper.EncTool.Parser.AssetMetadata;
+using Hi3Helper.Data;
+using Hi3Helper.EncTool.Parser.AssetMetadata;
+using Hi3Helper.EncTool.Parser.Senadina;
+using Hi3Helper.Http;
+using System.Buffers;
 using System.IO.Compression;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
 
 namespace Hi3Helper.EncTool.Test
 {
     internal class Program
     {
+
+
         static async Task Main(string[] args)
         {
+            #region unused
+
             using (SRMetadata srm = new SRMetadata("https://globaldp-prod-os01.starrails.com/query_dispatch", "3a57430d8d",
                 "?version={0}{1}&t={2}&language_type=3&platform_type=3&channel_id=1&sub_channel_id=1&is_new_format=1",
                 "?version={0}{1}&t={2}&uid=0&language_type=3&platform_type=3&dispatch_seed={3}&channel_id=1&sub_channel_id=1&is_need_url=1",
@@ -83,6 +95,7 @@ static async Task Main(string[] args)
                 }
             }
             */
+            #endregion
         }
     }
 }
diff --git a/qodana.yaml b/qodana.yaml
@@ -40,4 +40,6 @@ dependencyIgnores:
   - name: "ColorCode.WinUI"
   # Microsoft...
   - name: "System.CommandLine"
-  - name: "System.CommandLine.NamingConventionBinder"
+  - name: "System.CommandLine.NamingConventionBinder"
+  # huh?
+  - name: "ThisAssembly.Constants"