Merge pull request #183 from taooceros/PinyinLibraryChange

Pinyin library change

Author: jjw24

Flow.Launcher.Infrastructure/Alphabet.cs

@@ -53,10 +53,10 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NLog.Schema" Version="4.7.0-rc1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-    <PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
+    <PackageReference Include="ToolGood.Words.Pinyin" Version="3.0.1.4" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JetBrains.Annotations;
+using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Infrastructure.Storage;
+using Flow.Launcher.Infrastructure.UserSettings;
+using ToolGood.Words.Pinyin;
+using System.Threading.Tasks;
+
+namespace Flow.Launcher.Infrastructure
+{
+    public interface IAlphabet
+    {
+        string Translate(string stringToTranslate);
+    }
+
+    public class PinyinAlphabet : IAlphabet
+    {
+        private ConcurrentDictionary<string, string> _pinyinCache = new ConcurrentDictionary<string, string>();
+        private Settings _settings;
+
+        public void Initialize([NotNull] Settings settings)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+        }
+
+
+        public string Translate(string content)
+        {
+            if (_settings.ShouldUsePinyin)
+            {
+                if (!_pinyinCache.ContainsKey(content))
+                {
+                    if (WordsHelper.HasChinese(content))
+                    {
+                        var result = WordsHelper.GetPinyin(content, ";");
+                        result = GetFirstPinyinChar(result) + result.Replace(";", "");
+                        _pinyinCache[content] = result;
+                        return result;
+                    }
+                    else
+                    {
+                        return content;
+                    }
+                }
+                else
+                {
+                    return _pinyinCache[content];
+                }
+            }
+            else
+            {
+                return content;
+            }
+        }
+
+        private string GetFirstPinyinChar(string content)
+        {
+            return string.Concat(content.Split(';').Select(x => x.First()));
+        }
+    }
+}

Flow.Launcher.Infrastructure/PinyinAlphabet.cs

@@ -29,7 +29,7 @@ public partial class App : IDisposable, ISingleInstanceApp
         private SettingWindowViewModel _settingsVM;
         private readonly Updater _updater = new Updater(Flow.Launcher.Properties.Settings.Default.GithubRepo);
         private readonly Portable _portable = new Portable();
-        private readonly Alphabet _alphabet = new Alphabet();
+        private readonly PinyinAlphabet _alphabet = new PinyinAlphabet();
         private StringMatcher _stringMatcher;
 
         [STAThread]

Flow.Launcher/App.xaml.cs

@@ -21,11 +21,11 @@ public class PublicAPIInstance : IPublicAPI
     {
         private readonly SettingWindowViewModel _settingsVM;
         private readonly MainViewModel _mainVM;
-        private readonly Alphabet _alphabet;
+        private readonly PinyinAlphabet _alphabet;
 
         #region Constructor
 
-        public PublicAPIInstance(SettingWindowViewModel settingsVM, MainViewModel mainVM, Alphabet alphabet)
+        public PublicAPIInstance(SettingWindowViewModel settingsVM, MainViewModel mainVM, PinyinAlphabet alphabet)
         {
             _settingsVM = settingsVM;
             _mainVM = mainVM;
@@ -76,7 +76,6 @@ public void SaveAppAllSettings()
             _settingsVM.Save();
             PluginManager.Save();
             ImageLoader.Save();
-            _alphabet.Save();
         }
 
         public void ReloadAllPluginData()