feat: 导入歌曲时，将图片转换为AssetBundle格式（默认开启，可关闭）；以及优化ImageToAbTool、ModifyId的逻辑。 (#61)

* [R] 抽取和分离CreateTextureAssetBundle的逻辑

* [+] 引入新的配置项：ConvertJacketToAssetBundle，默认开启，行为是会在导入歌曲时自动把图片打包为ab

* [+] SetMusicJacketApi，根据全局配置项，决定是否在导入时把图片转为ab；ModifyId，在歌曲已为ab格式的封面图的情况下，会重打包ab。

* [+] ImageToAbTool，优化输出目录的计算逻辑，和新增“是否需要删除原有的PNG/JPG图片？”的选项，

* [F] 修复各种小问题

* fix: 一些可能的小问题

* fix: 应该是原本存在的问题，没有格式化传入的 id。只是测试的时候都是用的六位数做文件名所以没发现

* chore: JacketPath 改成可空

* fix: 路径大小写

* Update MaiChartManager/Controllers/Tools/ImageToAbToolController.cs

Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>

* fixup

---------

Co-authored-by: Clansty <i@gao4.pw>
Co-authored-by: 凌莞~(=^▽^=) <opensource@c5y.moe>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>

Author: 3 people

MaiChartManager/Config.cs

@@ -27,6 +27,7 @@ public class Config
     public bool IgnoreLevel { get; set; } = false;
     public bool DisableBga { get; set; } = false;
     public bool UseLegacyMaiLib { get; set; } = false;
+    public bool ConvertJacketToAssetBundle { get; set; } = true;
     public int UiZoom { get; set; } = 0;
 
     public void Save()

MaiChartManager/Controllers/App/SettingsController.cs

@@ -11,6 +11,7 @@ public class SettingsDto
     public bool IgnoreLevel { get; set; }
     public bool DisableBga { get; set; }
     public bool UseLegacyMaiLib { get; set; }
+    public bool ConvertJacketToAssetBundle { get; set; }
     public int UiZoom { get; set; }
     public double TargetDpiScale { get; set; }
 }
@@ -30,6 +31,7 @@ public SettingsDto GetSettings()
             IgnoreLevel = StaticSettings.Config.IgnoreLevel,
             DisableBga = StaticSettings.Config.DisableBga,
             UseLegacyMaiLib = StaticSettings.Config.UseLegacyMaiLib,
+            ConvertJacketToAssetBundle = StaticSettings.Config.ConvertJacketToAssetBundle,
             UiZoom = StaticSettings.Config.UiZoom,
             TargetDpiScale = Browser.TargetDpiScale,
         };
@@ -44,6 +46,7 @@ public void SetSettings([FromBody] SettingsDto dto)
         StaticSettings.Config.IgnoreLevel = dto.IgnoreLevel;
         StaticSettings.Config.DisableBga = dto.DisableBga;
         StaticSettings.Config.UseLegacyMaiLib = dto.UseLegacyMaiLib;
+        StaticSettings.Config.ConvertJacketToAssetBundle = dto.ConvertJacketToAssetBundle;
         StaticSettings.Config.Save();
     }
 }

MaiChartManager/Controllers/Music/MusicController.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using AssetStudio;
 using MaiChartManager.Models;
 using MaiChartManager.Utils;
@@ -157,27 +157,39 @@ public string AddMusic(int id, string assetDir)
     [HttpPut]
     public string SetMusicJacket(int id, IFormFile file, string assetDir)
     {
-        var nonDxId = id % 10000;
         var ext = Path.GetExtension(file.FileName).ToLowerInvariant();
         if (!MusicXml.jacketExtensions.Contains(ext[1..]))
         {
             return Locale.UnsupportedImageFormat;
         }
 
         var music = settings.GetMusic(id, assetDir);
-        while (music?.JacketPath is not null && System.IO.File.Exists(music.JacketPath))
-        {
-            FileSystem.DeleteFile(music.JacketPath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
-        }
+        if (music is null) return "Music not found!";
+        music.DeleteJacket(); // 删除老的jacket
 
         var abiDir = Path.Combine(StaticSettings.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();
-        if (music is not null)
+        
+        if (StaticSettings.Config.ConvertJacketToAssetBundle)
+        { // 将图片转为AssetBundle
+            using var buffer = new MemoryStream();
+            file.CopyTo(buffer);
+            var imageBytes = buffer.ToArray();
+
+            var assetBundleDir = Path.GetDirectoryName(abiDir)!;
+            var resultAbPath = AssetBundleCreator.CreateMusicJacketAssetBundles(
+                imageBytes, assetBundleDir, music.NonDxId);
+            StaticSettings.AssetBundleJacketMap[music.NonDxId] = resultAbPath;
+        }
+        else
+        {
+            var path = Path.Combine(abiDir, $"ui_jacket_{music.NonDxId:000000}{ext}");
+            using var write = System.IO.File.Open(path, FileMode.Create);
+            file.CopyTo(write);
+            write.Close();
             music.JacketPath = path;
+        }
+
         return "";
     }
 

MaiChartManager/Controllers/Music/MusicTransferController.cs

@@ -506,6 +506,13 @@ private void DeleteIfExists(params string[] path)
         }
     }
 
+    private void DeleteAb(string abPath)
+    {
+        FileSystem.DeleteFile(abPath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
+        if (System.IO.File.Exists(abPath + ".manifest"))
+            FileSystem.DeleteFile(abPath + ".manifest", UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
+    }
+
     [HttpPost]
     public async Task ModifyId(int id, [FromBody] int newId, string assetDir)
     {
@@ -521,16 +528,18 @@ public async Task ModifyId(int id, [FromBody] int newId, string assetDir)
         }
         var newNonDxId = newId % 10000;
 
-        var abJacketTarget = Path.Combine(StaticSettings.StreamingAssets, assetDir, "AssetBundleImages", "jacket", $"ui_jacket_{newNonDxId:000000}.ab");
-        var abJacketSTarget = Path.Combine(StaticSettings.StreamingAssets, assetDir, "AssetBundleImages", "jacket_s", $"ui_jacket_{newNonDxId:000000}_s.ab");
+        var abiDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, @"AssetBundleImages\jacket");
+        var abiSDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, @"AssetBundleImages\jacket_s");
+        Directory.CreateDirectory(abiDir);
+        Directory.CreateDirectory(abiSDir);
+        var abJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}.ab");
+        var abJacketSTarget = Path.Combine(abiSDir, $"ui_jacket_{newNonDxId:000000}_s.ab");
         var acbawbTarget = Path.Combine(StaticSettings.StreamingAssets, assetDir, "SoundData", $"music{newNonDxId:000000}");
         var movieTarget = Path.Combine(StaticSettings.StreamingAssets, assetDir, "MovieData", $"{newNonDxId:000000}");
         var newMusicDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, "music", $"music{newId:000000}");
         DeleteIfExists(abJacketTarget, abJacketTarget + ".manifest", abJacketSTarget, abJacketSTarget + ".manifest", acbawbTarget + ".acb", acbawbTarget + ".awb", movieTarget + ".dat", movieTarget + ".mp4", newMusicDir);
-        var abiDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, @"AssetBundleImages\jacket");
-        Directory.CreateDirectory(abiDir);
 
-        // jacket
+        #region 移动或重打包封面图
         var jacketSourcePath = music.JacketPath is not null ? music.JacketPath : music.PseudoAssetBundleJacket;
         if (jacketSourcePath is not null)
         {
@@ -542,29 +551,51 @@ public async Task ModifyId(int id, [FromBody] int newId, string assetDir)
         }
         else if (music.AssetBundleJacket is not null)
         {
-            // 否则需要执行转换逻辑
-            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);
-            // AB→PNG: the old .ab.manifest no longer has a matching .ab at the new ID, so just delete it instead of moving
-            if (System.IO.File.Exists(music.AssetBundleJacket + ".manifest"))
+            var oldAb = music.AssetBundleJacket!;
+            var oldSmallAb = GetAssetBundleJacketSmallPath(oldAb);
+            var idPad = $"{newNonDxId:000000}";
+            logger.LogInformation("Repack jacket AB: {oldMainAb} -> {abJacketTarget}", oldAb, abJacketTarget);
+            
+            // 重打包大jacket
+            AssetBundleCreator.RepackTextureAssetBundle(
+                oldAb,
+                abJacketTarget,
+                $"UI_Jacket_{idPad}",
+                $"assets/assetbundle/jacket/ui_jacket_{idPad}.png",
+                $"jacket/ui_jacket_{idPad}.ab");
+            
+            // 对小jacket：如果存在，重打包；如果不存在，则从png重新缩放，重新CreateTextureAssetBundle
+            if (oldSmallAb is not null && System.IO.File.Exists(oldSmallAb))
             {
-                FileSystem.DeleteFile(music.AssetBundleJacket + ".manifest", UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
+                AssetBundleCreator.RepackTextureAssetBundle(
+                    oldSmallAb,
+                    abJacketSTarget,
+                    $"UI_Jacket_{idPad}_s",
+                    $"assets/assetbundle/jacket_s/ui_jacket_{idPad}_s.png",
+                    $"jacket_s/ui_jacket_{idPad}_s.ab");
             }
-
-            // Issue #42: also clean up the companion jacket_s AB so it doesn't stay orphaned under the old ID
-            var oldJacketSPath = GetAssetBundleJacketSmallPath(music.AssetBundleJacket);
-            if (oldJacketSPath is not null && System.IO.File.Exists(oldJacketSPath))
+            else
             {
-                FileSystem.DeleteFile(oldJacketSPath, UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
-                if (System.IO.File.Exists(oldJacketSPath + ".manifest"))
-                {
-                    FileSystem.DeleteFile(oldJacketSPath + ".manifest", UIOption.OnlyErrorDialogs, RecycleOption.SendToRecycleBin);
-                }
+                var pngBytes = music.GetMusicJacketPngData();
+                AssetBundleCreator.CreateTextureAssetBundle(
+                    pngBytes,
+                    abJacketSTarget,
+                    $"UI_Jacket_{idPad}_s",
+                    $"assets/assetbundle/jacket_s/ui_jacket_{idPad}_s.png",
+                    $"jacket_s/ui_jacket_{idPad}_s.ab",
+                    resizeWidth: 200,
+                    resizeHeight: 200);
             }
+            
+            DeleteAb(oldAb);
+            if (oldSmallAb is not null) DeleteAb(oldSmallAb);
+
+            StaticSettings.AssetBundleJacketMap.Remove(music.NonDxId);
+            StaticSettings.AssetBundleJacketMap[newNonDxId] = abJacketTarget;
         }
+        #endregion
 
+        #region 移动音频和视频
         // 我也不知道它需不需要重新保存，先直接移动试试
         // 是可以的
         if (StaticSettings.AcbAwb.TryGetValue($"music{music.NonDxId:000000}.acb", out var acb))
@@ -585,6 +616,7 @@ public async Task ModifyId(int id, [FromBody] int newId, string assetDir)
             logger.LogInformation("Move movie: {movie} -> {movieTarget}", movie, movieTarget);
             FileSystem.MoveFile(movie, movieTarget + Path.GetExtension(movie), UIOption.OnlyErrorDialogs);
         }
+        #endregion
 
         // 谱面
         var oldMusicDir = Path.GetDirectoryName(music.FilePath)!;

MaiChartManager/Controllers/Tools/ImageToAbToolController.cs

@@ -6,7 +6,7 @@ namespace MaiChartManager.Controllers.Tools;
 
 [ApiController]
 [Route("MaiChartManagerServlet/[action]Api")]
-public partial class ImageToAbToolController(ILogger<ImageToAbToolController> logger) : ControllerBase
+public partial class ImageToAbToolController(StaticSettings settings, ILogger<ImageToAbToolController> logger) : ControllerBase
 {
     [GeneratedRegex(@"^(?<id>\d+)\.(png|jpg|jpeg)$", RegexOptions.IgnoreCase)]
     private static partial Regex NumericFileRegex();
@@ -44,6 +44,17 @@ public async Task ImageToAbTool()
             await WriteEvent(ImageToAbEventType.Error, Locale.FileNotSelected);
             return;
         }
+        
+        // 所选择的路径是否是正规的OPT内jacket路径。方法是判断路径结尾是否是AssetBundleImages\jacket
+        var isIngameJacketPath = selectedPath.TrimEnd('\\').EndsWith(@"AssetBundleImages\jacket", StringComparison.OrdinalIgnoreCase);
+
+        var deleteOriginalPngAfterSuccess = false;
+        if (isIngameJacketPath)
+        {
+            deleteOriginalPngAfterSuccess = MessageBox.Show(
+                Locale.ImageToAbDeleteOriginalPngQuestion, Locale.ImageToAb, MessageBoxButtons.YesNo, 
+                MessageBoxIcon.Question) == DialogResult.Yes;
+        }
 
         var candidates = Directory.EnumerateFiles(selectedPath)
             .Select(path => new
@@ -56,13 +67,13 @@ public async Task ImageToAbTool()
                 var numericMatch = NumericFileRegex().Match(x.Name);
                 if (numericMatch.Success)
                 {
-                    return new ImageTaskItem(x.Path, numericMatch.Groups["id"].Value);
+                    return new ImageTaskItem(x.Path, numericMatch.Groups["id"].Value.PadLeft(6, '0'));
                 }
 
                 var uiJacketMatch = UiJacketFileRegex().Match(x.Name);
                 if (uiJacketMatch.Success)
                 {
-                    return new ImageTaskItem(x.Path, uiJacketMatch.Groups["id"].Value);
+                    return new ImageTaskItem(x.Path, uiJacketMatch.Groups["id"].Value.PadLeft(6, '0'));
                 }
 
                 return null;
@@ -79,8 +90,9 @@ await WriteEvent(
             return;
         }
 
-        var jacketDir = Path.Combine(selectedPath, "jacket");
-        var jacketSmallDir = Path.Combine(selectedPath, "jacket_s");
+        var outputRootDir = isIngameJacketPath ? Path.GetDirectoryName(selectedPath)! : selectedPath;
+        var jacketDir = Path.Combine(outputRootDir, "jacket");
+        var jacketSmallDir = Path.Combine(outputRootDir, "jacket_s");
         Directory.CreateDirectory(jacketDir);
         Directory.CreateDirectory(jacketSmallDir);
 
@@ -119,8 +131,22 @@ await WriteEvent(
             {
                 logger.LogError(ex, "Failed to create AB for image {ImagePath}", item.FilePath);
                 failures.Add($"{Path.GetFileName(item.FilePath)}: {ex.Message}");
+                continue;
+            }
+            if (deleteOriginalPngAfterSuccess)
+            {
+                try
+                { // 删除原始文件。如果删除失败，也不要抛异常，只是打个警告
+                    System.IO.File.Delete(item.FilePath);
+                }
+                catch (Exception ex)
+                {
+                    logger.LogWarning(ex, "Failed to delete source PNG after ImageToAb: {Path}", item.FilePath);
+                }
             }
         }
+        
+        await settings.RescanAll(); // rescan all
 
         if (failures.Count > 0)
         {

MaiChartManager/Front/src/client/apiGen.ts

@@ -403,6 +403,7 @@ export interface SettingsDto {
   ignoreLevel?: boolean;
   disableBga?: boolean;
   useLegacyMaiLib?: boolean;
+  convertJacketToAssetBundle?: boolean;
   /** @format int32 */
   uiZoom?: number;
   /** @format double */

MaiChartManager/Front/src/locales/en.yaml

@@ -618,6 +618,7 @@ settings:
   yuv420p: Use YUV420P color space when converting USM
   noScale: Don't scale video to 1080 width
   useLegacyMaiLib: Use legacy chart converter for import/export (compatibility mode)
+  convertJacketToAssetBundle: Use native AssetBundle format for music jackets
   updateChannel: Update Channel
   updateChannelSlow: Stable
   updateChannelCi: Fast

MaiChartManager/Front/src/locales/zh-TW.yaml

@@ -579,6 +579,7 @@ settings:
   yuv420p: 轉換 USM 時使用 YUV420P 顏色空間
   noScale: 不要縮放影片到 1080 寬度
   useLegacyMaiLib: 匯入/匯出時，使用舊版轉譜器進行轉譜（相容模式）
+  convertJacketToAssetBundle: 歌曲封面圖使用原生AssetBundle格式
   updateChannel: 更新通道
   updateChannelSlow: 穩定
   updateChannelCi: 快速

MaiChartManager/Front/src/locales/zh.yaml

@@ -573,6 +573,7 @@ settings:
   yuv420p: 转换 USM 时使用 YUV420P 颜色空间
   noScale: 不要缩放视频到 1080 宽度
   useLegacyMaiLib: 导入/导出时，使用旧版转谱器进行转谱（兼容模式）
+  convertJacketToAssetBundle: 歌曲封面图使用原生AssetBundle格式
   updateChannel: 更新通道
   updateChannelSlow: 稳定
   updateChannelCi: 快速

MaiChartManager/Front/src/views/Settings/ImportOptionsSection.tsx

@@ -29,6 +29,7 @@ export default defineComponent({
           </div>
           <CheckBox v-model:value={appSettings.value.yuv420p} onChange={onSettingChange}>{t('settings.yuv420p')}</CheckBox>
           <CheckBox v-model:value={appSettings.value.noScale} onChange={onSettingChange}>{t('settings.noScale')}</CheckBox>
+          <CheckBox v-model:value={appSettings.value.convertJacketToAssetBundle} onChange={onSettingChange}>{t('settings.convertJacketToAssetBundle')}</CheckBox>
           <CheckBox v-model:value={appSettings.value.useLegacyMaiLib} onChange={onSettingChange}>{t('settings.useLegacyMaiLib')}</CheckBox>
         </div>
       </div>