Skip to content

fix: 修改歌曲ID功能的两个bug #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Starrah wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: 修改歌曲ID功能的两个bug #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22d84e5
fix: add missing MaiLib VCS config .idea/.../vcs.xml
Starrah Jan 27, 2026
33c952e
fix: 使用“修改歌曲ID”功能时，图片会被移动到错误的路径下
Starrah Jan 27, 2026
75e4764
refactor: 合并一段在代码上完全一样的冗余逻辑
Starrah Jan 27, 2026
892df07
fix: 谱面路径newMusicDir不应该对10000取模。其他的（图片、音频等）才需要，谱面是不需要的。
Starrah Jan 27, 2026
503e6e9
重命名变量
Starrah Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/.idea.Sitreamai/.idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 9 additions & 13 deletions MaiChartManager/Controllers/Music/MusicTransferController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,28 +228,24 @@ public void ModifyId(int id, [FromBody] int newId, string assetDir)
var abJacketTarget = Path.Combine(StaticSettings.StreamingAssets, assetDir, "AssetBundleImages", "jacket", $"ui_jacket_{newNonDxId:000000}.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{newNonDxId:000000}");
var newMusicDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, "music", $"music{newId:000000}");
DeleteIfExists(abJacketTarget, abJacketTarget + ".manifest", acbawbTarget + ".acb", acbawbTarget + ".awb", movieTarget + ".dat", movieTarget + ".mp4", newMusicDir);
var abiDir = Path.Combine(StaticSettings.GamePath, "StreamingAssets", assetDir, @"AssetBundleImages\jacket");
var abiDir = Path.Combine(StaticSettings.StreamingAssets, assetDir, @"AssetBundleImages\jacket");
Directory.CreateDirectory(abiDir);

// jacket
if (music.JacketPath is not null)
{
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 jacketSourcePath = music.JacketPath is not null ? music.JacketPath : music.PseudoAssetBundleJacket;
if (jacketSourcePath is not null)
{
var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}{Path.GetExtension(music.PseudoAssetBundleJacket)}");
// 如果music.JacketPath或music.PseudoAssetBundleJacket不为空，则直接执行移动逻辑即可
var localJacketTarget = Path.Combine(abiDir, $"ui_jacket_{newNonDxId:000000}{Path.GetExtension(jacketSourcePath)}");
DeleteIfExists(localJacketTarget);
logger.LogInformation("Move jacket: {music.PseudoAssetBundleJacket} -> {localJacketTarget}", music.PseudoAssetBundleJacket, localJacketTarget);
FileSystem.MoveFile(music.PseudoAssetBundleJacket, localJacketTarget, UIOption.OnlyErrorDialogs);
logger.LogInformation("Move jacket: {jacketSourcePng} -> {localJacketTarget}", jacketSourcePath, localJacketTarget);
FileSystem.MoveFile(jacketSourcePath, localJacketTarget, UIOption.OnlyErrorDialogs);
}
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()!);
Expand Down