增加字典加载失败的提示; 现在内置字典使用相对路径加载, 避免版本升级后路径与已保存路径不一致导致的加载失败;

Author: stratosblue

src/ChinesePinyinIntelliSenseExtenderPackage.cs

@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using System.Threading;
+using System.Windows;
 
 using ChinesePinyinIntelliSenseExtender.Options;
 using ChinesePinyinIntelliSenseExtender.Util;
@@ -12,9 +13,9 @@
 namespace ChinesePinyinIntelliSenseExtender;
 
 [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-[Guid(ChinesePinyinIntelliSenseExtenderPackage.PackageGuidString)]
-[ProvideOptionPage(typeof(OptionPages.General), "IntelliSense拼音补全", "常规", 0, 0, true)]
-[ProvideOptionPage(typeof(OptionPages.DictionaryManage), "IntelliSense拼音补全", "字典", 0, 0, true)]
+[Guid(PackageGuidString)]
+[ProvideOptionPage(typeof(OptionPages.General), PackageName, "常规", 0, 0, true)]
+[ProvideOptionPage(typeof(OptionPages.DictionaryManage), PackageName, "字典", 0, 0, true)]
 [ProvideAutoLoad(UIContextGuids80.NoSolution, PackageAutoLoadFlags.BackgroundLoad)]
 [ProvideAutoLoad(UIContextGuids80.SolutionExists, PackageAutoLoadFlags.BackgroundLoad)]
 [ProvideAutoLoad(UIContextGuids80.SolutionHasMultipleProjects, PackageAutoLoadFlags.BackgroundLoad)]
@@ -28,6 +29,8 @@ public sealed class ChinesePinyinIntelliSenseExtenderPackage : AsyncPackage
     /// </summary>
     public const string PackageGuidString = "cd4393db-d533-4077-93da-9fdad98ddacf";
 
+    public const string PackageName = "IntelliSense拼音补全";
+
     #endregion Public 字段
 
     #region Package Members
@@ -38,8 +41,16 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
 
         var options = await DictionaryManageOptions.GetLiveInstanceAsync(cancellationToken);
 
-        _ = InputMethodDictionaryGroupProvider.LoadFromOptionsAsync(options, cancellationToken);
+        _ = InputMethodDictionaryGroupProvider.LoadFromOptionsAsync(options, cancellationToken).ContinueWith(task =>
+        {
+            if (task.Exception is not null)
+            {
+                var exception = task.Exception.InnerException?.ToString();
+                cancellationToken.ThrowIfCancellationRequested();
+                MessageBox.Show($"Load options failed with \"{exception}\"", PackageName, MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }, cancellationToken, TaskContinuationOptions.OnlyOnFaulted, TaskScheduler.Current);
     }
 
     #endregion Package Members
-}
+}

src/Options/DictionaryManagePage.Designer.cs

@@ -73,6 +73,15 @@ private void ButtonAddDictionaryApplyCombination_Click(object sender, EventArgs
         }
     }
 
+    private void ButtonResetDictionaryApplyCombination_Click(object sender, EventArgs e)
+    {
+        if (MessageBox.Show("确定重置字典组合为默认值吗？", ChinesePinyinIntelliSenseExtenderPackage.PackageName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
+        {
+            Options.DictionaryCombinations.Clear();
+            LoadDictionaryCombinationTree();
+        }
+    }
+
     private bool DeleteableDictionary(object sender)
     {
         return sender is ListBox listBox
@@ -145,4 +154,4 @@ private void TryReloadDictionaryCombinationTree(bool force)
             LoadDictionaryCombinationTree();
         }
     }
-}
+}

src/Options/DictionaryManagePage.cs

@@ -17,19 +17,21 @@ internal static class InputMethodDictionaryLoader
 
     #region Public 属性
 
-    public static string KanaDicPath => Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "Assets", "Dictionaries", "jap_poly.dict.yaml");
+    public static string KanaDicPath => Path.Combine(".", "Assets", "Dictionaries", "jap_poly.dict.yaml");
 
-    public static string PinyinDicPath => Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "Assets", "Dictionaries", "pinyin_simp.dict.yaml");
+    public static string PinyinDicPath => Path.Combine(".", "Assets", "Dictionaries", "pinyin_simp.dict.yaml");
 
-    public static string Wubi86DicPath => Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "Assets", "Dictionaries", "wubi86_jidian.dict.yaml");
+    public static string Wubi86DicPath => Path.Combine(".", "Assets", "Dictionaries", "wubi86_jidian.dict.yaml");
 
     #endregion Public 属性
 
     #region Public 方法
 
     public static async Task<InputMethodReverseDictionary> LoadFilesAsync(IEnumerable<string> paths, CancellationToken cancellationToken = default)
     {
-        var allPath = paths.Select(m => m.Trim('\"')).ToArray();
+        var workingDirectory = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
+
+        var allPath = paths.Select(m => Path.Combine(workingDirectory, m).Trim('\"')).ToArray();
 
         foreach (var item in allPath)
         {