Optimize language options

.github/workflows/build_test.yml

@@ -0,0 +1,43 @@
+name: Build on release
+on:
+  release:
+    types: created
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install Net
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+          cache: true
+
+      - name: Dowmload Powertoys
+        run: |
+          curl -L https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysUserSetup-0.84.0-x64.exe -o powertoys.exe
+          run powertoys.exe -install -quiet -norestart
+          timeout /t 15
+          mkdir lib
+          copy "%LOCALAPPDATA%\PowerToys\PowerToys.Common.UI.dll" "lib\PowerToys.Common.UI.dll"
+          copy "%LOCALAPPDATA%\PowerToys\PowerToys.ManagedCommon.dll" "lib\PowerToys.ManagedCommon.dll"
+          copy "%LOCALAPPDATA%\PowerToys\PowerToys.Settings.UI.Lib.dll" "lib\PowerToys.Settings.UI.Lib.dll"
+          copy "%LOCALAPPDATA%\PowerToys\Wox.Infrastructure.dll" "lib\Wox.Infrastructure.dll"
+          copy "%LOCALAPPDATA%\PowerToys\Wox.Plugin.dll" "lib\Wox.Plugin.dll"
+
+      - name: Package
+        run: dotnet pack
+
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          # Artifact name
+          name: Translator_x64
+          # A file, directory or wildcard pattern that describes what to upload
+          path: "bin/out"

.gitignore

@@ -1,7 +1,7 @@
 obj
 bin
 *.dll
-lib
 
 .vs/
-src/lib
+src/lib
+.idea

Translater.csproj

@@ -5,6 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <UseWPF>true</UseWPF>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>

lib.bat

@@ -1,5 +1,11 @@
-copy "C:\Program Files\PowerToys\PowerToys.Common.UI.dll" "lib\PowerToys.Common.UI.dll"
-copy "C:\Program Files\PowerToys\PowerToys.ManagedCommon.dll" "lib\PowerToys.ManagedCommon.dll"
-copy "C:\Program Files\PowerToys\PowerToys.Settings.UI.Lib.dll" "lib\PowerToys.Settings.UI.Lib.dll"
-copy "C:\Program Files\PowerToys\Wox.Infrastructure.dll" "lib\Wox.Infrastructure.dll"
-copy "C:\Program Files\PowerToys\Wox.Plugin.dll" "lib\Wox.Plugin.dll"
+mkdir -p -e lib
+copy "C:\Program Files\PowerToys\PowerToys.Common.UI.dll" "lib\PowerToys.Common.UI.dll" /y
+copy "C:\Program Files\PowerToys\PowerToys.ManagedCommon.dll" "lib\PowerToys.ManagedCommon.dll" /y
+copy "C:\Program Files\PowerToys\PowerToys.Settings.UI.Lib.dll" "lib\PowerToys.Settings.UI.Lib.dll" /y
+copy "C:\Program Files\PowerToys\Wox.Infrastructure.dll" "lib\Wox.Infrastructure.dll" /y
+copy "C:\Program Files\PowerToys\Wox.Plugin.dll" "lib\Wox.Plugin.dll" /y
+copy "%LOCALAPPDATA%\PowerToys.Common.UI.dll" "lib\PowerToys.Common.UI.dll" /y
+copy "%LOCALAPPDATA%\PowerToys.ManagedCommon.dll" "lib\PowerToys.ManagedCommon.dll" /y
+copy "%LOCALAPPDATA%\PowerToys.Settings.UI.Lib.dll" "lib\PowerToys.Settings.UI.Lib.dll" /y
+copy "%LOCALAPPDATA%\Wox.Infrastructure.dll" "lib\Wox.Infrastructure.dll" /y
+copy "%LOCALAPPDATA%\Wox.Plugin.dll" "lib\Wox.Plugin.dll" /y

lib/.gitignore

@@ -0,0 +1 @@
+./*

packages.lock.json

@@ -0,0 +1,6 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net8.0-windows7.0": {}
+  }
+}

src/SettingHelper.cs

@@ -4,27 +4,62 @@ namespace Translator
 {
     public class SettingHelper
     {
-        public static readonly List<string> languagesKeys = new List<string> { "auto", "zh-CHS", "zh-CHT", "en", "ja", "ko", "ru", "fr", "es", "ar", "de", "it", "he" };
-        public static readonly List<string> languagesOptions = new List<string> { "auto", "Chinese (Simplified)", "Chinese (Traditional)", "English", "Japanese", "Korean", "Russian", "French", "Spanish", "Arabic", "German", "Italian", "Hebrew" };
-        public static readonly List<string> dictUrlPatternKeys = new List<string> { "Youdao", "Oxford", "Cambridge" };
-        public static readonly List<string> dictUrlPatternValues = new List<string> { "https://www.youdao.com/result?word={0}&lang=en", "https://www.oed.com/search/dictionary/?scope=Entries&q={0}", "https://dictionary.cambridge.org/us/dictionary/english/{0}" };
-        public static readonly List<PluginAdditionalOption> pluginAdditionalOptions = GetAdditionalOptions();
-        public string defaultLanguageKey = "auto";
-        public bool enableSuggest = true;
-        public bool enableAutoRead = false;
-        public bool enableSecondLanuage = false;
-        public string secondLanuageKey = "auto";
-        public bool showOriginalQuery = false;
-        public bool enableJumpToDict = false;
-        public string dictUtlPattern = dictUrlPatternValues[0];
+        public static readonly List<string> DictUrlPatternKeys = new List<string> { "Youdao", "Oxford", "Cambridge" };
+        public static readonly List<string> DictUrlPatternValues = new List<string> { "https://www.youdao.com/result?word={0}&lang=en", "https://www.oed.com/search/dictionary/?scope=Entries&q={0}", "https://dictionary.cambridge.org/us/dictionary/english/{0}" };
+        public static readonly List<PluginAdditionalOption> PluginAdditionalOptions = GetAdditionalOptions();
+        public string DefaultLanguageKey = "auto";
+        public bool EnableSuggest = true;
+        public bool EnableAutoRead = false;
+        public bool EnableSecondLanuage = false;
+        public string SecondLanuageKey = "auto";
+        public bool ShowOriginalQuery = false;
+        public bool EnableJumpToDict = false;
+        public string DictUtlPattern = DictUrlPatternValues[0];
 
-        public static List<PluginAdditionalOption> GetAdditionalOptions()
+        public abstract class Languages
         {
-            var lanuageItems = languagesOptions.Select((val, idx) =>
+            private static readonly Dictionary<string, string> LanguageContrast = new Dictionary<string, string>
             {
-                return new KeyValuePair<string, string>(val, idx.ToString());
-            }).ToList();
-            var dictItems = dictUrlPatternKeys.Select((val, idx) =>
+                { "auto", "auto" },
+                { "zh-CHS", "Chinese (Simplified)" },
+                { "zh-CHT", "Chinese (Traditional)" },
+                { "en", "English" },
+                { "ja", "Japanese" },
+                { "ko", "Korean" },
+                { "ru", "Russian" },
+                { "fr", "French" },
+                { "es", "Spanish" },
+                { "ar", "Arabic" },
+                { "de", "German" },
+                { "it", "Italian" },
+                { "he", "Hebrew" },
+            };
+
+            private static readonly Dictionary<string, string> LanguageAbbreviation = new Dictionary<string, string>
+            {
+                { "zhs", "zh-CHS" },
+                { "zht", "zh-CHT" },
+            };
+
+            public static string MatchLanguageCode(string languageKey)
+            {
+                string defaultLanguageCode = "auto";
+                languageKey = languageKey is null ? defaultLanguageCode : languageKey;
+                LanguageAbbreviation.TryGetValue(languageKey, out languageKey);
+                LanguageContrast.TryGetValue(languageKey, out defaultLanguageCode);
+                return defaultLanguageCode;
+            }
+
+            public static List<KeyValuePair<string, string>> ContrastList()
+            {
+                return LanguageContrast.ToList();
+            }
+        }
+
+        public static List<PluginAdditionalOption> GetAdditionalOptions()
+        {
+            var lanuageItems = Languages.ContrastList();
+            var dictItems = DictUrlPatternKeys.Select((val, idx) =>
             {
                 return new KeyValuePair<string, string>(val, idx.ToString());
             }).ToList();

src/TranslateHelper.cs

@@ -2,6 +2,8 @@
 using Wox.Plugin.Logger;
 using Translator.Utils;
 using System.Windows.Media;
+using Translator.Youdao;
+
 namespace Translator;
 
 public class TranslateFailedException : Exception
@@ -16,6 +18,11 @@ public class TranslateHelper
 {
     public struct TranslateTarget
     {
+        public TranslateTarget(string source, string target)
+        {
+            src = source;
+            target = SettingHelper.Languages.MatchLanguageCode(target);
+        }
         public string src;
         public string toLan;
     }
@@ -24,7 +31,7 @@ public struct TranslateTarget
     private object initLock = new Object();
     private long lastInitTime = 0;
     private IPublicAPI publicAPI;
-    private List<Youdao.ITranslator?> translators;
+    private List<Translator.Youdao.ITranslator?> translators;
     private List<Type> translatorTypes;
     private bool isSpeaking = false;
     private bool isIniting = false;
@@ -35,7 +42,7 @@ public TranslateHelper(IPublicAPI publicAPI, string defaultLanguageKey = "auto")
             null, null, null
         };
         translatorTypes = new List<Type>{
-            typeof(Youdao.V2.YoudaoTranslator),
+            typeof(Translator),
             typeof(Youdao.old.YoudaoTranslator),
             typeof(Youdao.Backup.BackUpTranslator)
         };
@@ -72,7 +79,7 @@ public List<ResultItem> QueryTranslate(string raw, string translateFrom = "user
         var target = ParseRawSrc(raw);
         string src = target.src;
         string toLan = toLanuage ?? target.toLan;
-        Youdao.ITranslateResult? translateResult = null;
+        Translator.Youdao.ITranslateResult? translateResult = null;
         int idx = 0;
         translateResult = this.translators.FirstNotNoneCast((it) =>
         {
@@ -199,7 +206,7 @@ public bool InitTranslater()
                     try
                     {
                         var tran = tp.GetConstructor(Type.EmptyTypes)?.Invoke(null);
-                        this.translators[idx] = tran as Youdao.ITranslator;
+                        this.translators[idx] = tran as Translator.Youdao.ITranslator;
                     }
                     catch (Exception ex)
                     {

src/Translator.cs

@@ -25,7 +25,7 @@ public class Translator : IPlugin, IDisposable, IDelayedExecutionPlugin, ISettin
         public string Name => "Translator";
         public static string PluginID => "EY1EBAMTNIWIVLYM039DSOS5MWITDJOD";
         public string Description => "A simple translation plugin, based on Youdao Translation";
-        public IEnumerable<PluginAdditionalOption> AdditionalOptions => SettingHelper.pluginAdditionalOptions;
+        public IEnumerable<PluginAdditionalOption> AdditionalOptions => SettingHelper.PluginAdditionalOptions;
         public PluginMetadata? queryMetaData = null;
         public IPublicAPI? publicAPI = null;
         public const int delayQueryMillSecond = 500;
@@ -186,7 +186,7 @@ public List<Result> Query(Query query, bool delayedExecution)
 
             // get suggest in other thread
             Task<List<ResultItem>>? suggestTask = null;
-            if (settingHelper.enableSuggest)
+            if (settingHelper.EnableSuggest)
             {
                 suggestTask = Task.Run(() =>
                 {
@@ -196,11 +196,11 @@ public List<Result> Query(Query query, bool delayedExecution)
 
             // get second translate result in other thread
             Task<List<ResultItem>>? secondTranslateTask = null;
-            if (settingHelper.enableSecondLanuage && settingHelper.secondLanuageKey != null)
+            if (settingHelper.EnableSecondLanuage && settingHelper.SecondLanuageKey != null)
             {
                 secondTranslateTask = Task.Run(() =>
                 {
-                    return translateHelper!.QueryTranslate(querySearch, toLanuage: settingHelper.secondLanuageKey);
+                    return translateHelper!.QueryTranslate(querySearch, toLanuage: settingHelper.SecondLanuageKey);
                 });
             }
 
@@ -220,7 +220,7 @@ public List<Result> Query(Query query, bool delayedExecution)
                 res.AddRange(suggest);
             }
 
-            if (settingHelper.showOriginalQuery)
+            if (settingHelper.ShowOriginalQuery)
             {
                 res.Add(new ResultItem
                 {
@@ -243,7 +243,7 @@ public List<Result> Query(Query query, bool delayedExecution)
                 });
             }
 
-            if (settingHelper.enableAutoRead)
+            if (settingHelper.EnableAutoRead)
             {
                 this.translateHelper?.Read(res.FirstOrDefault()?.Title);
             }
@@ -273,7 +273,7 @@ public void Init(PluginInitContext context)
             publicAPI = context.API;
             var translaTask = Task.Factory.StartNew(() =>
             {
-                translateHelper = new TranslateHelper(publicAPI, this.settingHelper.defaultLanguageKey);
+                translateHelper = new TranslateHelper(publicAPI, this.settingHelper.DefaultLanguageKey);
             });
             suggestHelper = new Suggest.SuggestHelper(publicAPI);
             historyHelper = new History.HistoryHelper();
@@ -306,7 +306,7 @@ public void UpdateSettings(PowerLauncherPluginSettings settings)
             this.settingHelper.UpdateSettings(settings);
 
             if (this.translateHelper != null)
-                this.translateHelper.defaultLanguageKey = this.settingHelper.defaultLanguageKey;
+                this.translateHelper.defaultLanguageKey = this.settingHelper.DefaultLanguageKey;
         }
         public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
         {
@@ -340,15 +340,15 @@ public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
                 }
 
             };
-            if (settingHelper.enableJumpToDict)
+            if (settingHelper.EnableJumpToDict)
             {
                 contextMenu.Add(
                     new ContextMenuResult
                     {
                         Title = "Go to dictionary",
                         Action = context =>
                         {
-                            Helper.OpenInShell(string.Format(settingHelper.dictUtlPattern, selectedResult.Title));
+                            Helper.OpenInShell(string.Format(settingHelper.DictUtlPattern, selectedResult.Title));
                             return false;
                         },
                         Glyph = "\xE721",

src/Youdao/YoudaoTranslatorV2.cs

@@ -8,7 +8,7 @@
 using Translator.Utils;
 using Wox.Plugin.Logger;
 
-namespace Translator.Youdao.V2;
+namespace Translator.Youdao;
 
 public class KeyResponse
 {