BinSvip：将修改发音转小写防止触发xs陈年老bug；修复缺省歌手选项不起作用的问题

Author: yqzhishen

csharp/Plugins/BinSvip/BinarySvipConst.cs

@@ -32,17 +32,13 @@ public static string GetName(string id)
             return Regex.IsMatch(id, "[FM]\\d+") ? $"$({id})" : "";
         }
 
-        public static string GetId(string name, string defaultName = null)
+        public static string GetId(string name)
         {
             foreach (var singer in SingerNames.Where(singer => singer.Value.Equals(name)))
             {
                 return singer.Key;
             }
-            if (Regex.IsMatch(name, "\\$\\([FM]\\d+\\)"))
-            {
-                return name.Substring(2, name.Length - 3);
-            }
-            return defaultName ?? "";
+            return Regex.IsMatch(name, "\\$\\([FM]\\d+\\)") ? name.Substring(2, name.Length - 3) : "";
         }
     }
 

csharp/Plugins/BinSvip/BinarySvipEncoder.cs

@@ -109,9 +109,14 @@ private SingingTool.Model.ITrack EncodeTrack(Track track)
             switch (track)
             {
                 case SingingTrack singingTrack:
+                    var singerId = Singers.GetId(singingTrack.AISingerName);
+                    if (singerId == "")
+                    {
+                        singerId = Singers.GetId(DefaultSinger);
+                    }
                     var sTrack = new SingingTool.Model.SingingTrack
                     {
-                        AISingerId = Singers.GetId(singingTrack.AISingerName, DefaultSinger),
+                        AISingerId = singerId,
                         ReverbPreset = ReverbPresets.GetIndex(singingTrack.ReverbPreset)
                     };
                     foreach (var note in singingTrack.NoteList)
@@ -156,7 +161,7 @@ private SingingTool.Model.Note EncodeNote(Note note)
                 KeyIndex = note.KeyNumber + 12,
                 Lyric = note.Lyric,
                 HeadTag = NoteHeadTags.GetIndex(note.HeadTag),
-                Pronouncing = note.Pronunciation
+                Pronouncing = note.Pronunciation?.ToLower()
             };
             resultNote.WidthPos = (int) Math.Round(
                     Synchronizer.GetActualTicksFromTicks(note.StartPos + note.Length)) - resultNote.ActualStartPos;

csharp/Plugins/BinSvip/Properties.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Plugin>
     <Name>BinSvip</Name>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
     <Author>YQ之神</Author>
     <HomePage>https://space.bilibili.com/102844209</HomePage>
     <Descriptions>原始二进制 .svip 文件转换插件。&#x000A;若要指定歌手编号与名称的转换关系，或添加已拥有编号但未公开发行的歌手，请修改 SingerDict.json。