Merge pull request #107 from jitwxs/dev

Release v4.6
jitwxs · Jul 10, 2022 · 3c5f3c0 · 3c5f3c0
2 parents 95e9358 + f6add9e
commit 3c5f3c0
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 9 deletions.
diff --git a/MusicLyricApp/Bean/Constants.cs b/MusicLyricApp/Bean/Constants.cs
@@ -4,7 +4,7 @@ namespace MusicLyricApp.Bean
 {
     public static class Constants
     {
-        public const string Version = "v4.5";
+        public const string Version = "v4.6";
 
         public static readonly string SettingPath = Environment.CurrentDirectory + "\\MusicLyricAppSetting.json";
 

diff --git a/MusicLyricApp/Bean/MusicLyricsVO.cs b/MusicLyricApp/Bean/MusicLyricsVO.cs
@@ -85,6 +85,14 @@ public enum RomajiSystemEnum
         [Description("平文式")] HEPBURN = 2,
     }
 
+    // 译文缺省规则
+    public enum TranslateLyricDefaultRuleEnum
+    {
+        [Description("忽略展示")] IGNORE = 0,
+        [Description("展示空行")] EMPTY_LINE = 1,
+        [Description("填充原文")] FILL_ORIGIN = 2,
+    }
+
     /**
      * 错误码
      */
@@ -412,7 +420,7 @@ public bool IsIllegalContent()
                 return true;
             }
 
-            if ("//".Equals(Content))
+            if ("//".Equals(Content.Trim()))
             {
                 return true;
             }

diff --git a/MusicLyricApp/Bean/SettingBase.cs b/MusicLyricApp/Bean/SettingBase.cs
@@ -25,6 +25,11 @@ public class ConfigBean
         /// 自动检查更新
         /// </summary>
         public bool AutoCheckUpdate = true;
+
+        /// <summary>
+        /// 译文缺省规则
+        /// </summary>
+        public TranslateLyricDefaultRuleEnum TranslateLyricDefaultRule = TranslateLyricDefaultRuleEnum.IGNORE;
 
         /// <summary>
         /// 罗马音相关配置

diff --git a/MusicLyricApp/SettingForm.Designer.cs b/MusicLyricApp/SettingForm.Designer.cs
diff --git a/MusicLyricApp/SettingForm.cs b/MusicLyricApp/SettingForm.cs
@@ -34,6 +34,7 @@ private void Save_Btn_Click(object sender, EventArgs e)
             _settingBean.Config.RomajiConfig.Enable = ShowRomaji_CheckBox.Checked;
             _settingBean.Config.RomajiConfig.ModeEnum = (RomajiModeEnum)RomajiMode_ComboBox.SelectedIndex;
             _settingBean.Config.RomajiConfig.SystemEnum = (RomajiSystemEnum)RomajiSystem_ComboBox.SelectedIndex;
+            _settingBean.Config.TranslateLyricDefaultRule = (TranslateLyricDefaultRuleEnum)TranLyricDefaultRule_ComboBox.SelectedIndex;
 
             Close();
         }

diff --git a/MusicLyricApp/Utils/LyricUtils.cs b/MusicLyricApp/Utils/LyricUtils.cs
@@ -79,7 +79,7 @@ private static async Task<List<LyricLineVo>> FormatLyric(string originLrc, strin
                 return translateLyrics;
             }
 
-            List<LyricLineVo> res = null;
+            List<LyricLineVo> res;
             switch (showLrcType)
             {
                 case ShowLrcTypeEnum.ORIGIN_PRIOR_ISOLATED:
@@ -102,8 +102,11 @@ private static async Task<List<LyricLineVo>> FormatLyric(string originLrc, strin
                 case ShowLrcTypeEnum.TRANSLATE_PRIOR_MERGE:
                     res = MergeLrc(originLyrics, translateLyrics, searchInfo.SettingBean.Param.LrcMergeSeparator, false);
                     break;
+                default:
+                    throw new NotSupportedException("not support showLrcType: " + showLrcType);
             }
-            return res;
+
+            return DealTranslateLyricDefaultRule(res, searchInfo.SettingBean.Config.TranslateLyricDefaultRule);
         }
 
         /**
@@ -180,9 +183,9 @@ private static List<LyricLineVo> SortLrc(List<LyricLineVo> originLyrics, List<Ly
         /**
          * 双语歌词合并
          */
-        private static List<LyricLineVo> MergeLrc(List<LyricLineVo> originLrcs, List<LyricLineVo> translateLrcs, string splitStr, bool hasOriginLrcPrior)
+        private static List<LyricLineVo> MergeLrc(List<LyricLineVo> originList, List<LyricLineVo> translateList, string splitStr, bool hasOriginLrcPrior)
         {
-            var c = SortLrc(originLrcs, translateLrcs, hasOriginLrcPrior);
+            var c = SortLrc(originList, translateList, hasOriginLrcPrior);
 
             var list = new List<LyricLineVo>
             {
@@ -206,6 +209,54 @@ private static List<LyricLineVo> MergeLrc(List<LyricLineVo> originLrcs, List<Lyr
             return list;
         }
 
+        /**
+         * 译文缺省逻辑处理
+         */
+        private static List<LyricLineVo> DealTranslateLyricDefaultRule(List<LyricLineVo> voList, TranslateLyricDefaultRuleEnum rule)
+        {
+            if (rule != TranslateLyricDefaultRuleEnum.IGNORE)
+            {
+                var timestampCounts = new Dictionary<long, int>();
+
+                foreach (var key in voList.Select(one => one.Timestamp.TimeOffset))
+                {
+                    if (timestampCounts.ContainsKey(key))
+                    {
+                        timestampCounts[key] += 1;
+                    }
+                    else
+                    {
+                        timestampCounts.Add(key,1);
+                    }
+                }
+
+                var dealTimestamps = (from pair in timestampCounts where pair.Value == 1 select pair.Key).ToList();
+                dealTimestamps.Sort((a, b) => a.CompareTo(b));
+
+                var dealTimestampIndex = 0;
+
+                for (var i = 0; i < voList.Count; i++)
+                {
+                    var cur = voList[i];
+                    var timestamp = dealTimestamps[dealTimestampIndex];
+
+                    if (cur.Timestamp.TimeOffset == timestamp)
+                    {
+                        var content = rule == TranslateLyricDefaultRuleEnum.FILL_ORIGIN ? cur.Content : "";
+                        voList.Insert(++i, new LyricLineVo(content, cur.Timestamp));
+                        dealTimestampIndex++;
+
+                        if (dealTimestampIndex >= dealTimestamps.Count)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return voList;
+        }
+
         /**
          * 歌词排序函数
          */