diff --git a/OpenUtau.Core/Classic/VoicebankInstaller.cs b/OpenUtau.Core/Classic/VoicebankInstaller.cs index 8f43e77d..26dac726 100644 --- a/OpenUtau.Core/Classic/VoicebankInstaller.cs +++ b/OpenUtau.Core/Classic/VoicebankInstaller.cs @@ -69,8 +69,19 @@ public void Install(string path, string singerType) { using (var stream = File.Open(filePath, FileMode.Open)) { config = VoicebankConfig.Load(stream); } + bool changed = false; if (string.IsNullOrEmpty(config.SingerType)) { config.SingerType = singerType; + changed = true; + } + // Honor the text encoding chosen in the wizard. Without this, a + // character.yaml lacking text_file_encoding keeps being read as + // shift_jis even after the user picks another encoding. + if (!string.Equals(config.TextFileEncoding, textEncoding.WebName, StringComparison.OrdinalIgnoreCase)) { + config.TextFileEncoding = textEncoding.WebName; + changed = true; + } + if (changed) { SaveConfigSafely(filePath, config); } } diff --git a/OpenUtauMobile/Helpers/SingerListHelper.cs b/OpenUtauMobile/Helpers/SingerListHelper.cs new file mode 100644 index 00000000..d6e702c7 --- /dev/null +++ b/OpenUtauMobile/Helpers/SingerListHelper.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using System.Linq; +using OpenUtau.Core; +using OpenUtau.Core.Ustx; + +namespace OpenUtauMobile.Helpers; + +/// +/// 歌手列表辅助方法。 +/// +public static class SingerListHelper +{ + /// + /// 按歌手类型固定顺序展开 。 + /// 的分组顺序取决于文件系统的目录枚举顺序, + /// 安装新歌手后目录顺序变化会让 DiffSinger 等分组跑到列表最前面,因此这里按 + /// 的数值顺序展开以保证列表稳定;分组内部保持 Core 已有的本地化排序。 + /// + /// 按类型、再按名称排序后的歌手列表。 + public static List GetOrderedSingers() + { + Dictionary> groups = SingerManager.Inst.SingerGroups; + List singers = []; + foreach (KeyValuePair> pair in groups.OrderBy(pair => pair.Key)) + { + if (pair.Value == null) continue; + foreach (USinger singer in pair.Value) + { + if (singer != null) + { + singers.Add(singer); + } + } + } + + return singers; + } +} diff --git a/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs b/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs index 9765f3ae..18dbf212 100644 --- a/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs +++ b/OpenUtauMobile/ViewModels/SingerManagementViewModel.cs @@ -2,7 +2,6 @@ using System.Reactive; using System.Threading.Tasks; using DynamicData.Binding; -using OpenUtau.Core; using OpenUtau.Core.Ustx; using OpenUtauMobile.Helpers; using OpenUtauMobile.Services.Dialogs; @@ -80,23 +79,8 @@ public override void OnNavigatedTo() private async Task RefreshSingersAsync() { - List list = await Task.Run(() => - { - List singers = []; - foreach (var group in SingerManager.Inst.SingerGroups.Values) - { - if (group == null) continue; - foreach (var singer in group) - { - if (singer != null) - { - singers.Add(singer); - } - } - } - - return singers; - }); + // 按歌手类型固定顺序展开,避免安装新歌手后分组顺序随目录枚举顺序变化 + List list = await Task.Run(SingerListHelper.GetOrderedSingers); Singers.Load(list); } diff --git a/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs b/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs index 746acc82..9c435d9e 100644 --- a/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs +++ b/OpenUtauMobile/ViewModels/SingerPickerViewModel.cs @@ -2,8 +2,8 @@ using System.Reactive; using System.Threading.Tasks; using DynamicData.Binding; -using OpenUtau.Core; using OpenUtau.Core.Ustx; +using OpenUtauMobile.Helpers; using ReactiveUI; using ReactiveUI.Fody.Helpers; @@ -38,23 +38,8 @@ public SingerPickerViewModel() private async Task LoadSingersAsync() { IsLoading = true; - List list = await Task.Run(() => - { - List singers = []; - foreach (var group in SingerManager.Inst.SingerGroups.Values) - { - if (group == null) continue; - foreach (var singer in group) - { - if (singer != null) - { - singers.Add(singer); - } - } - } - - return singers; - }); + // 按歌手类型固定顺序展开,保证与歌手管理页顺序一致 + List list = await Task.Run(SingerListHelper.GetOrderedSingers); Singers.Load(list); IsLoading = false; }