chore: mml 依赖检测条件修改

Author: clansty

MaiChartManager/Controllers/Mod/InstallationController.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO.Compression;
 using System.Security.Cryptography;
 using MaiChartManager.Utils;
@@ -34,7 +34,8 @@ public record GameModInfo(
         bool IsJudgeDisplay4BInstalled,
         bool IsHidConflictExist,
         AquaMaiSignatureV2.VerifyResult? Signature,
-        bool IsMmlLibInstalled
+        bool IsAdxHidIoModAbsent,
+        bool IsMmlLegacyLibsInstalled
     );
 
     [HttpGet]
@@ -55,7 +56,17 @@ public GameModInfo GetGameModInfo()
             sig = AquaMaiSignatureV2.VerifySignature(System.IO.File.ReadAllBytes(ModPaths.AquaMaiDllInstalledPath));
         }
 
-        return new GameModInfo(IsMelonInstalled(), aquaMaiInstalled, aquaMaiVersion, aquaMaiBuiltinVersion!, GetIsJudgeDisplay4BInstalled(), GetIsHidConflictExist(), sig, GetIsMmlLibInstalled());
+        return new GameModInfo(
+            IsMelonInstalled(),
+            aquaMaiInstalled,
+            aquaMaiVersion,
+            aquaMaiBuiltinVersion!,
+            GetIsJudgeDisplay4BInstalled(),
+            GetIsHidConflictExist(),
+            sig,
+            GetIsAdxHidIoModAbsent(),
+            GetIsMmlLegacyLibsInstalled()
+        );
     }
 
     [NonAction]
@@ -100,12 +111,14 @@ public void DeleteHidConflict()
     #endregion
 
     [NonAction]
-    private static bool GetIsMmlLibInstalled()
+    private static bool GetIsAdxHidIoModAbsent()
+    {
+        return !System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Mods\ADXHIDIOMod.dll"));
+    }
+
+    [NonAction]
+    private static bool GetIsMmlLegacyLibsInstalled()
     {
-        if (System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Mods\ADXHIDIOMod.dll")))
-        {
-            return false;
-        }
         if (!System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\hidapi.dll")))
         {
             return false;
@@ -118,21 +131,32 @@ private static bool GetIsMmlLibInstalled()
         return true;
     }
 
+    private static void CopyFile(string src, string dest)
+    {
+        Directory.CreateDirectory(Path.GetDirectoryName(dest)!);
+        using var read = System.IO.File.OpenRead(src);
+        using var write = System.IO.File.Open(dest, FileMode.Create);
+        read.CopyTo(write);
+    }
+
+    public record InstallMmlLibsDto(bool UseLegacy);
+
     [HttpPost]
-    public void InstallMmlLibs()
+    public void InstallMmlLibs([FromBody] InstallMmlLibsDto req)
     {
-        if (GetIsMmlLibInstalled()) return;
+        var isMaimollerLegacyModeEnabled = req.UseLegacy;
         if (System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Mods\ADXHIDIOMod.dll")))
         {
             System.IO.File.Delete(Path.Combine(StaticSettings.GamePath, @"Mods\ADXHIDIOMod.dll"));
         }
+        if (!isMaimollerLegacyModeEnabled || GetIsMmlLegacyLibsInstalled()) return;
         if (!System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\hidapi.dll")))
         {
-            System.IO.File.Copy(Path.Combine(StaticSettings.exeDir, @"hidapi.dll"), Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\hidapi.dll"));
+            CopyFile(Path.Combine(StaticSettings.exeDir, @"hidapi.dll"), Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\hidapi.dll"));
         }
         if (!System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\libadxhid.dll")))
         {
-            System.IO.File.Copy(Path.Combine(StaticSettings.exeDir, @"libadxhid.dll"), Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\libadxhid.dll"));
+            CopyFile(Path.Combine(StaticSettings.exeDir, @"libadxhid.dll"), Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\libadxhid.dll"));
         }
     }
 
@@ -143,7 +167,7 @@ public void InstallJudgeDisplay4B()
 
         foreach (var file in Directory.EnumerateFiles(judgeDisplay4BPath))
         {
-            System.IO.File.Copy(file, Path.Combine(StaticSettings.SkinAssetsDir, Path.GetFileName(file)), true);
+            CopyFile(file, Path.Combine(StaticSettings.SkinAssetsDir, Path.GetFileName(file)));
         }
     }
 
@@ -173,10 +197,7 @@ public void InstallAquaMai()
     {
         var src = Path.Combine(StaticSettings.exeDir, "AquaMai.dll");
         var dest = Path.Combine(StaticSettings.GamePath, @"Mods\AquaMai.dll");
-        Directory.CreateDirectory(Path.GetDirectoryName(dest));
-        using var read = System.IO.File.OpenRead(src);
-        using var write = System.IO.File.Open(dest, FileMode.Create);
-        read.CopyTo(write);
+        CopyFile(src, dest);
     }
 
     [HttpPost]
@@ -263,4 +284,4 @@ public void KillGameProcess()
             }
         }
     }
-}
+}

MaiChartManager/Front/src/client/apiGen.ts

@@ -172,7 +172,8 @@ export interface GameModInfo {
   isJudgeDisplay4BInstalled?: boolean;
   isHidConflictExist?: boolean;
   signature?: VerifyResult;
-  isMmlLibInstalled?: boolean;
+  isAdxHidIoModAbsent?: boolean;
+  isMmlLegacyLibsInstalled?: boolean;
 }
 
 export interface GenreAddRequest {
@@ -278,6 +279,10 @@ export interface InstallAquaMaiOnlineDto {
   sign?: string | null;
 }
 
+export interface InstallMmlLibsDto {
+  useLegacy?: boolean;
+}
+
 export interface MusicIdAndAssetDirPair {
   /** @format int32 */
   id?: number;
@@ -1513,10 +1518,12 @@ export class Api<
      * @name InstallMmlLibs
      * @request POST:/MaiChartManagerServlet/InstallMmlLibsApi
      */
-    InstallMmlLibs: (params: RequestParams = {}) =>
+    InstallMmlLibs: (data: InstallMmlLibsDto, params: RequestParams = {}) =>
       this.request<void, any>({
         path: `/MaiChartManagerServlet/InstallMmlLibsApi`,
         method: "POST",
+        body: data,
+        type: ContentType.Json,
         ...params,
       }),
 

MaiChartManager/Front/src/views/ModManager/sectionPanelOverride/GameSystem.MaimollerIO/index.tsx

@@ -15,7 +15,7 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const install = useAsyncState(async () => {
-      await api.InstallMmlLibs();
+      await api.InstallMmlLibs({ useLegacy: isLegacyModeEnabled.value });
       await updateModInfo();
     }, undefined, {
       immediate: false,
@@ -34,12 +34,32 @@ export default defineComponent({
     ];
 
     const PREFIX = 'GameSystem.MaimollerIO.';
+    const useLegacyEntryPath = PREFIX + 'UseLegacy';
     const knownPaths = [
       ...['P1', 'Touch1p', 'Button1p', 'Led1p', 'P2', 'Touch2p', 'Button2p', 'Led2p', 'Button1', 'Button2', 'Button3', 'Button4'].map(it => PREFIX + it),
     ];
 
+    const isLegacyModeEnabled = computed(() => {
+      const legacyEntry = props.entryStates[useLegacyEntryPath];
+      if (!legacyEntry) {
+        return true;
+      }
+      return Boolean(legacyEntry.value);
+    });
+
+    const isMmlRequirementSatisfied = computed(() => {
+      const isAdxHidIoModAbsent = Boolean(modInfo.value?.isAdxHidIoModAbsent);
+      if (!isAdxHidIoModAbsent) {
+        return false;
+      }
+      if (!isLegacyModeEnabled.value) {
+        return true;
+      }
+      return Boolean(modInfo.value?.isMmlLegacyLibsInstalled);
+    });
+
     return () => <div class="flex flex-col gap-2">
-      {!modInfo.value?.isMmlLibInstalled ? <div class="flex gap-2 items-center m-l-35">
+      {!isMmlRequirementSatisfied.value ? <div class="flex gap-2 items-center m-l-35">
         <span class="c-orange">{t('mod.mmlIo.notInstalled')}</span>
         <Button variant="secondary" onClick={() => install.execute()} ing={install.isLoading.value}>{t('mod.oneClickInstall')}</Button>
       </div>

MaiChartManager/MaiChartManager.csproj

@@ -28,7 +28,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <IsPublishable>False</IsPublishable>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;CRACK</DefineConstants>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">