曲绘目录默认设为 AssetBundleImages

clansty · clansty · commit 0465f439ac90 · 2025-08-19T06:16:24.000+08:00
diff --git a/MaiChartManager/Controllers/Music/MusicController.cs b/MaiChartManager/Controllers/Music/MusicController.cs
@@ -147,7 +147,9 @@ public string SetMusicJacket(int id, IFormFile file, string assetDir)
             FileSystem.DeleteFile(music.JacketPath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
         }
 
-        var path = Path.Combine(StaticSettings.ImageAssetsDir, $"{nonDxId:000000}{ext}");
+        var abiDir = Path.Combine(StaticSettings.GamePath, "StreamingAssets", assetDir, @"AssetBundleImages\jacket");
+        Directory.CreateDirectory(abiDir);
+        var path = Path.Combine(abiDir, $"ui_jacket_{nonDxId:000000}{ext}");
         using var write = System.IO.File.Open(path, FileMode.Create);
         file.CopyTo(write);
         write.Close();
diff --git a/MaiChartManager/Controllers/Music/MusicTransferController.cs b/MaiChartManager/Controllers/Music/MusicTransferController.cs
@@ -85,14 +85,16 @@ public void RequestCopyTo(RequestCopyToRequest request)
             Directory.CreateDirectory(Path.Combine(dest, @"AssetBundleImages\jacket"));
             if (music.JacketPath is not null)
             {
-                FileSystem.CopyFile(music.JacketPath, Path.Combine(dest, $@"AssetBundleImages\jacket\ui_jacket_{music.NonDxId:000000}{Path.GetExtension(music.JacketPath)}"), UIOption.OnlyErrorDialogs);
+                FileSystem.CopyFile(music.JacketPath, Path.Combine(dest, $@"AssetBundleImages\jacket\ui_jacket_{music.NonDxId:000000}{Path.GetExtension(music.JacketPath)}"),
+                    UIOption.OnlyErrorDialogs);
             }
             else if (music.AssetBundleJacket is not null)
             {
                 FileSystem.CopyFile(music.AssetBundleJacket, Path.Combine(dest, $@"AssetBundleImages\jacket\{Path.GetFileName(music.AssetBundleJacket)}"), UIOption.OnlyErrorDialogs);
                 if (System.IO.File.Exists(music.AssetBundleJacket + ".manifest"))
                 {
-                    FileSystem.CopyFile(music.AssetBundleJacket + ".manifest", Path.Combine(dest, $@"AssetBundleImages\jacket\{Path.GetFileName(music.AssetBundleJacket)}.manifest"), UIOption.OnlyErrorDialogs);
+                    FileSystem.CopyFile(music.AssetBundleJacket + ".manifest", Path.Combine(dest, $@"AssetBundleImages\jacket\{Path.GetFileName(music.AssetBundleJacket)}.manifest"),
+                        UIOption.OnlyErrorDialogs);
                 }
             }
             else if (music.PseudoAssetBundleJacket is not null)
@@ -228,25 +230,27 @@ public void ModifyId(int id, [FromBody] int newId, string assetDir)
         var movieTarget = Path.Combine(StaticSettings.StreamingAssets, assetDir, "MovieData", $"{newNonDxId:000000}");
         var newMusicDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, "music", $"music{newNonDxId:000000}");
         DeleteIfExists(abJacketTarget, abJacketTarget + ".manifest", acbawbTarget + ".acb", acbawbTarget + ".awb", movieTarget + ".dat", movieTarget + ".mp4", newMusicDir);
+        var abiDir = Path.Combine(StaticSettings.GamePath, "StreamingAssets", assetDir, @"AssetBundleImages\jacket");
+        Directory.CreateDirectory(abiDir);
 
         // jacket
         if (music.JacketPath is not null)
         {
-            var localJacketTarget = Path.Combine(StaticSettings.ImageAssetsDir, $"{newNonDxId:000000}{Path.GetExtension(music.JacketPath)}");
+            var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}{Path.GetExtension(music.JacketPath)}");
             DeleteIfExists(localJacketTarget);
             logger.LogInformation("Move jacket: {music.JacketPath} -> {localJacketTarget}", music.JacketPath, localJacketTarget);
             FileSystem.MoveFile(music.JacketPath, localJacketTarget, UIOption.OnlyErrorDialogs);
         }
         else if (music.PseudoAssetBundleJacket is not null)
         {
-            var localJacketTarget = Path.Combine(StaticSettings.ImageAssetsDir, $"{newNonDxId:000000}{Path.GetExtension(music.PseudoAssetBundleJacket)}");
+            var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}{Path.GetExtension(music.PseudoAssetBundleJacket)}");
             DeleteIfExists(localJacketTarget);
             logger.LogInformation("Move jacket: {music.PseudoAssetBundleJacket} -> {localJacketTarget}", music.PseudoAssetBundleJacket, localJacketTarget);
             FileSystem.MoveFile(music.PseudoAssetBundleJacket, localJacketTarget, UIOption.OnlyErrorDialogs);
         }
         else if (music.AssetBundleJacket is not null)
         {
-            var localJacketTarget = Path.Combine(StaticSettings.ImageAssetsDir, $"{newNonDxId:000000}.png");
+            var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}.png");
             logger.LogInformation("Convert jacket: {music.AssetBundleJacket} -> {abJacketTarget}", music.AssetBundleJacket, abJacketTarget);
             System.IO.File.WriteAllBytes(localJacketTarget, music.GetMusicJacketPngData()!);
             FileSystem.DeleteFile(music.AssetBundleJacket, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
diff --git a/MaiChartManager/Front/src/components/FeedbackErrorDialog.tsx b/MaiChartManager/Front/src/components/FeedbackErrorDialog.tsx
@@ -11,7 +11,7 @@ export default defineComponent({
       let msg: string;
       if (!error.value) return "";
       if (error.value.error) {
-        msg = error.value.error.message || error.value.error.toString();
+        msg = error.value.error.message || error.value.error.detail || error.value.error.toString();
       } else if (error.value.message) {
         msg = error.value.message;
       } else {
@@ -49,10 +49,7 @@ export default defineComponent({
         default: () => <NFlex vertical size="large">
           <div class="text-lg">{errorContext.value}</div>
           {message.value}
-          <NInput v-model:value={userInput.value} class="w-full" type="textarea" placeholder="可以提供一下相关背景和上下文吗？比如说你的游戏或者乐曲有没有什么特别之处"/>
-        </NFlex>,
-        footer: () => <NFlex justify="end">
-          <NButton onClick={report}>发送反馈</NButton>
+          {/*<NInput v-model:value={userInput.value} class="w-full" type="textarea" placeholder="可以提供一下相关背景和上下文吗？比如说你的游戏或者乐曲有没有什么特别之处"/>*/}
         </NFlex>
       }}
     </NModal>;
diff --git a/MaiChartManager/Front/src/components/ImportCreateChartButton/ImportChartButton/index.tsx b/MaiChartManager/Front/src/components/ImportCreateChartButton/ImportChartButton/index.tsx
@@ -189,7 +189,7 @@ export default defineComponent({
           try {
             await uploadMovie(music.id, music.movie, padding);
           } catch (e: any) {
-            errors.value.push({level: MessageLevel.Warning, message: `视频转换失败: ${e?.message || e?.toString() || '我也不知道为什么'}`, name: music.name});
+            errors.value.push({level: MessageLevel.Warning, message: `视频转换失败: ${e.error?.message || e.error?.detail || e?.message || e?.toString() || '我也不知道为什么'}`, name: music.name});
           }
         }
 
@@ -205,7 +205,7 @@ export default defineComponent({
             step: music.importStep,
           }
         })
-        errors.value.push({level: MessageLevel.Fatal, message: e.error?.message || e.message || e.toString(), name: music.name});
+        errors.value.push({level: MessageLevel.Fatal, message: e.error?.message || e.error?.detail || e.message || e.toString(), name: music.name});
         try {
           await api.DeleteMusic(music.id, selectedADir.value);
         } catch {

Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,16 @@ public void RequestCopyTo(RequestCopyToRequest request)`
`85`	`85`	`Directory.CreateDirectory(Path.Combine(dest, @"AssetBundleImages\jacket"));`
`86`	`86`	`if (music.JacketPath is not null)`
`87`	`87`	`{`
`88`		`- FileSystem.CopyFile(music.JacketPath, Path.Combine(dest, $@"AssetBundleImages\jacket\ui_jacket_{music.NonDxId:000000}{Path.GetExtension(music.JacketPath)}"), UIOption.OnlyErrorDialogs);`
	`88`	`+ FileSystem.CopyFile(music.JacketPath, Path.Combine(dest, $@"AssetBundleImages\jacket\ui_jacket_{music.NonDxId:000000}{Path.GetExtension(music.JacketPath)}"),`
	`89`	`+ UIOption.OnlyErrorDialogs);`
`89`	`90`	`}`
`90`	`91`	`else if (music.AssetBundleJacket is not null)`
`91`	`92`	`{`
`92`	`93`	`FileSystem.CopyFile(music.AssetBundleJacket, Path.Combine(dest, $@"AssetBundleImages\jacket\{Path.GetFileName(music.AssetBundleJacket)}"), UIOption.OnlyErrorDialogs);`
`93`	`94`	`if (System.IO.File.Exists(music.AssetBundleJacket + ".manifest"))`
`94`	`95`	`{`
`95`		`- FileSystem.CopyFile(music.AssetBundleJacket + ".manifest", Path.Combine(dest, $@"AssetBundleImages\jacket\{Path.GetFileName(music.AssetBundleJacket)}.manifest"), UIOption.OnlyErrorDialogs);`
	`96`	`+ FileSystem.CopyFile(music.AssetBundleJacket + ".manifest", Path.Combine(dest, $@"AssetBundleImages\jacket\{Path.GetFileName(music.AssetBundleJacket)}.manifest"),`
	`97`	`+ UIOption.OnlyErrorDialogs);`
`96`	`98`	`}`
`97`	`99`	`}`
`98`	`100`	`else if (music.PseudoAssetBundleJacket is not null)`
`@@ -228,25 +230,27 @@ public void ModifyId(int id, [FromBody] int newId, string assetDir)`
`228`	`230`	`var movieTarget = Path.Combine(StaticSettings.StreamingAssets, assetDir, "MovieData", $"{newNonDxId:000000}");`
`229`	`231`	`var newMusicDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, "music", $"music{newNonDxId:000000}");`
`230`	`232`	`DeleteIfExists(abJacketTarget, abJacketTarget + ".manifest", acbawbTarget + ".acb", acbawbTarget + ".awb", movieTarget + ".dat", movieTarget + ".mp4", newMusicDir);`
	`233`	`+ var abiDir = Path.Combine(StaticSettings.GamePath, "StreamingAssets", assetDir, @"AssetBundleImages\jacket");`
	`234`	`+ Directory.CreateDirectory(abiDir);`
`231`	`235`
`232`	`236`	`// jacket`
`233`	`237`	`if (music.JacketPath is not null)`
`234`	`238`	`{`
`235`		`- var localJacketTarget = Path.Combine(StaticSettings.ImageAssetsDir, $"{newNonDxId:000000}{Path.GetExtension(music.JacketPath)}");`
	`239`	`+ var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}{Path.GetExtension(music.JacketPath)}");`
`236`	`240`	`DeleteIfExists(localJacketTarget);`
`237`	`241`	`logger.LogInformation("Move jacket: {music.JacketPath} -> {localJacketTarget}", music.JacketPath, localJacketTarget);`
`238`	`242`	`FileSystem.MoveFile(music.JacketPath, localJacketTarget, UIOption.OnlyErrorDialogs);`
`239`	`243`	`}`
`240`	`244`	`else if (music.PseudoAssetBundleJacket is not null)`
`241`	`245`	`{`
`242`		`- var localJacketTarget = Path.Combine(StaticSettings.ImageAssetsDir, $"{newNonDxId:000000}{Path.GetExtension(music.PseudoAssetBundleJacket)}");`
	`246`	`+ var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}{Path.GetExtension(music.PseudoAssetBundleJacket)}");`
`243`	`247`	`DeleteIfExists(localJacketTarget);`
`244`	`248`	`logger.LogInformation("Move jacket: {music.PseudoAssetBundleJacket} -> {localJacketTarget}", music.PseudoAssetBundleJacket, localJacketTarget);`
`245`	`249`	`FileSystem.MoveFile(music.PseudoAssetBundleJacket, localJacketTarget, UIOption.OnlyErrorDialogs);`
`246`	`250`	`}`
`247`	`251`	`else if (music.AssetBundleJacket is not null)`
`248`	`252`	`{`
`249`		`- var localJacketTarget = Path.Combine(StaticSettings.ImageAssetsDir, $"{newNonDxId:000000}.png");`
	`253`	`+ var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}.png");`
`250`	`254`	`logger.LogInformation("Convert jacket: {music.AssetBundleJacket} -> {abJacketTarget}", music.AssetBundleJacket, abJacketTarget);`
`251`	`255`	`System.IO.File.WriteAllBytes(localJacketTarget, music.GetMusicJacketPngData()!);`
`252`	`256`	`FileSystem.DeleteFile(music.AssetBundleJacket, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ export default defineComponent({`
`189`	`189`	`try {`
`190`	`190`	`await uploadMovie(music.id, music.movie, padding);`
`191`	`191`	`} catch (e: any) {`
`192`		- errors.value.push({level: MessageLevel.Warning, message: `视频转换失败: ${e?.message \|\| e?.toString() \|\| '我也不知道为什么'}`, name: music.name});
	`192`	+ errors.value.push({level: MessageLevel.Warning, message: `视频转换失败: ${e.error?.message \|\| e.error?.detail \|\| e?.message \|\| e?.toString() \|\| '我也不知道为什么'}`, name: music.name});
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
`@@ -205,7 +205,7 @@ export default defineComponent({`
`205`	`205`	`step: music.importStep,`
`206`	`206`	`}`
`207`	`207`	`})`
`208`		`- errors.value.push({level: MessageLevel.Fatal, message: e.error?.message \|\| e.message \|\| e.toString(), name: music.name});`
	`208`	`+ errors.value.push({level: MessageLevel.Fatal, message: e.error?.message \|\| e.error?.detail \|\| e.message \|\| e.toString(), name: music.name});`
`209`	`209`	`try {`
`210`	`210`	`await api.DeleteMusic(music.id, selectedADir.value);`
`211`	`211`	`} catch {`