Merge pull request #211 from jitwxs/dev

Release v6.2

Author: jitwxs

MusicLyricApp/Bean/Constants.cs

@@ -5,7 +5,7 @@ namespace MusicLyricApp.Bean
 {
     public static class Constants
     {
-        public const string Version = "v6.1";
+        public const string Version = "v6.2";
 
         public static readonly string SettingPath = Environment.CurrentDirectory + "\\MusicLyricAppSetting.json";
 

MusicLyricApp/Bean/MusicLyricsVO.cs

@@ -88,6 +88,7 @@ public enum LyricsTypeEnum
         [Description("中文译文")] CHINESE = 2,
         [Description("英文译文")] ENGLISH = 3,
         [Description("罗马音译文")] ROMAJI = 4,
+        [Description("拼音译文")] PINYIN = 5,
     }
 
     public enum LanguageEnum

MusicLyricApp/MusicLyricApp.csproj

@@ -77,6 +77,9 @@
     <Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
     </Reference>
+    <Reference Include="hyjiacan.py4n, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\hyjiacan.pinyin4net.4.1.1\lib\net47\hyjiacan.py4n.dll</HintPath>
+    </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.4.1.12, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.4.1\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>

MusicLyricApp/Utils/LyricUtils.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using hyjiacan.py4n;
 using MusicLyricApp.Api.Translate;
 using MusicLyricApp.Bean;
 using MusicLyricApp.Exception;
@@ -19,6 +20,8 @@ public abstract class LyricUtils
     {
         private static readonly Regex VerbatimRegex = new Regex(@"\(\d+,\d+\)");
 
+        private const PinyinFormat PinyinDefineFormat = PinyinFormat.WITH_TONE_MARK  | PinyinFormat.LOWERCASE | PinyinFormat.WITH_U_UNICODE;
+        
         /// <summary>
         /// 获取输出结果
         /// </summary>
@@ -34,7 +37,7 @@ public static async Task<List<string>> GetOutputContent(LyricVo lyricVo, SearchI
 
             var voListList = await FormatLyric(lyricVo.Lyric, lyricVo.TranslateLyric, searchInfo);
 
-            if (searchInfo.SettingBean.Param.EnableVerbatimLyric)
+            if (lyricVo.SearchSource == SearchSourceEnum.QQ_MUSIC && searchInfo.SettingBean.Param.EnableVerbatimLyric)
             {
                 for (var i = 0; i < voListList.Count; i++)
                 {
@@ -386,6 +389,12 @@ public static async Task<List<List<LyricLineVo>>> DealTranslateLyric(List<LyricL
                             result.Add(await RomajiUtils.ToRomaji(originList, transConfig.RomajiModeEnum, transConfig.RomajiSystemEnum));
                         }
                         break;
+                    case LyricsTypeEnum.PINYIN:
+                        if (originLanguage == LanguageEnum.CHINESE)
+                        {
+                            result.Add(await ToPinyin(originList, transConfig.LostRule));
+                        }
+                        break;
                     case LyricsTypeEnum.CHINESE:
                     case LyricsTypeEnum.ENGLISH:
                         // 输出语言和原始歌词语言只有不同时，才翻译
@@ -547,6 +556,36 @@ private static List<LyricLineVo> ResolveTransLyricDigitDeviationAndLost(List<Lyr
             return transList;
         }
 
+        private static Task<List<LyricLineVo>> ToPinyin(List<LyricLineVo> inputList, TransLyricLostRuleEnum lostRule)
+        {
+            var resultList = new List<LyricLineVo>();
+            
+            foreach (var vo in inputList)
+            {
+                string content;
+                
+                if (vo.IsIllegalContent())
+                {
+                    if (lostRule == TransLyricLostRuleEnum.IGNORE)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        content = "";
+                    }
+                }
+                else
+                {
+                    content = Pinyin4Net.GetPinyin(vo.Content, PinyinDefineFormat);
+                }
+                    
+                resultList.Add(new LyricLineVo(content, vo.Timestamp));
+            }
+
+            return Task.FromResult(resultList);
+        }
+        
         /**
          * 歌词排序函数
          */

MusicLyricApp/packages.config

@@ -61,4 +61,5 @@
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net48" />
   <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net48" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
+  <package id="hyjiacan.pinyin4net" version="4.1.1" targetFramework="net48" />
 </packages>

MusicLyricAppTest/MusicLyricAppTest.csproj

@@ -31,6 +31,7 @@
         <Reference Include="System" />
     </ItemGroup>
     <ItemGroup>
+        <PackageReference Include="hyjiacan.pinyin4net" Version="4.1.1" />
         <PackageReference Include="Kawazu" Version="1.1.4" />
         <PackageReference Include="Markdig" Version="0.30.4" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
@@ -50,6 +51,7 @@
       <Compile Include="Utils\GlobalUtilsTest.cs" />
       <Compile Include="Utils\LyricUtilsTest.cs" />
       <Compile Include="Utils\NetEaseMusicSearchUtils.cs" />
+      <Compile Include="Utils\PinyinTest.cs" />
       <Compile Include="Utils\SrtUtilsTest.cs" />
       <Compile Include="Utils\XmlUtils.cs" />
     </ItemGroup>

MusicLyricAppTest/Utils/PinyinTest.cs

@@ -0,0 +1,35 @@
+using System;
+using hyjiacan.py4n;
+using NUnit.Framework;
+
+namespace MusicLyricAppTest.Utils
+{
+    [TestFixture]
+    public class PinyinTest
+    {
+
+        [Test]
+        public void TestQuickStart()
+        {
+            // 设置拼音输出格式
+            const PinyinFormat format = PinyinFormat.WITH_TONE_MARK  | PinyinFormat.LOWERCASE | PinyinFormat.WITH_U_UNICODE;
+
+            // 判断是否是汉字
+            Assert.IsTrue(PinyinUtil.IsHanzi('李'));
+            
+            // 取出指定汉字的所有拼音
+            Console.WriteLine(string.Join(",", Pinyin4Net.GetPinyin('好')));
+            
+            // 取出指定汉字的所有拼音（经过格式化的）
+            Console.WriteLine(string.Join(",", Pinyin4Net.GetPinyin('好', format)));
+            
+            // 取指定汉字的唯一或者第一个拼音
+            Console.WriteLine(Pinyin4Net.GetFirstPinyin('好'));
+            
+            // 取指定汉字的唯一或者第一个拼音（经过格式化的）
+            Console.WriteLine(Pinyin4Net.GetFirstPinyin('好', format));
+
+            Console.WriteLine(Pinyin4Net.GetPinyin("你好吗这里是 china 北京！", format));
+        }
+    }
+}