enable export error message

studyzy · Apr 5, 2020 · d0f0981 · d0f0981
1 parent e639d9a
commit d0f0981
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/src/IME WL Converter Win/Forms/MainForm.cs b/src/IME WL Converter Win/Forms/MainForm.cs
@@ -229,7 +229,8 @@ private void btnConvert_Click(object sender, EventArgs e)
                 mainBody.Filters = GetFilters();
                 mainBody.BatchFilters = GetBatchFilters();
                 mainBody.ReplaceFilters = GetReplaceFilters();
-                mainBody.Import.ImportLineErrorNotice += WriteErrorMessage; 
+                mainBody.Import.ImportLineErrorNotice += WriteErrorMessage;
+                mainBody.Export.ExportErrorNotice += WriteErrorMessage;
                 mainBody.ProcessNotice+=RichTextBoxShow;
                 timer1.Enabled = true;
                 backgroundWorker1.RunWorkerAsync();

diff --git a/src/ImeWlConverterCore/IME/BaseImport.cs b/src/ImeWlConverterCore/IME/BaseImport.cs
@@ -39,5 +39,11 @@ protected void SendImportLineErrorNotice(string msg)
         {
             ImportLineErrorNotice?.Invoke(msg);
         }
+
+        public event Action<string> ExportErrorNotice;
+        protected void SendExportErrorNotice(string msg)
+        {
+            ExportErrorNotice?.Invoke(msg);
+        }
     }
 }
diff --git a/src/ImeWlConverterCore/IME/Win10MsPinyin.cs b/src/ImeWlConverterCore/IME/Win10MsPinyin.cs
@@ -170,13 +170,14 @@ public WordLibraryList ImportLine(string str)
         {
             throw new NotImplementedException("二进制文件不支持单个词汇的转换");
         }
-
+        public event Action<string> ExportErrorNotice;
+
         public IList<string> Export(WordLibraryList wlList)
         {
             //Win10拼音只支持最多32个字符的编码
             wlList = Filter(wlList);
 
-            string tempPath = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName) + "\\Win10微软拼音词库.dat";
+            string tempPath = Path.Combine(FileOperationHelper.GetCurrentFolderPath(), "\\Win10微软拼音词库.dat");
             if (File.Exists(tempPath)) { File.Delete(tempPath); }
             var fs = new FileStream(tempPath, FileMode.OpenOrCreate, FileAccess.Write);
             BinaryWriter bw = new BinaryWriter(fs);

diff --git a/src/ImeWlConverterCore/IME/Win10MsPinyinSelfStudy.cs b/src/ImeWlConverterCore/IME/Win10MsPinyinSelfStudy.cs
@@ -531,6 +531,11 @@ public WordLibraryList ImportLine(string str)
             throw new NotImplementedException("二进制文件不支持单个词汇的转换");
         }
         public string ExportFilePath { get; set; }
+        public event Action<string> ExportErrorNotice;
+        protected void SendExportErrorNotice(string msg)
+        {
+            ExportErrorNotice?.Invoke(msg);
+        }
         /// <summary>
         /// 最多支持2W条一个dat文件
         /// </summary>
@@ -543,7 +548,7 @@ public IList<string> Export(WordLibraryList wlList)
             var list = new List<WordLibraryList>();
             if(wlList.Count>20000)
             {
-                throw new Exception("微软拼音自学习词库最多支持2万条记录的导入，当前词条数为："+wlList.Count+"，操过限制，请设置过滤条件或者更换词库源。");
+                SendExportErrorNotice("微软拼音自学习词库最多支持2万条记录的导入，当前词条数为："+wlList.Count+"，超过限制，请设置过滤条件或者更换词库源。");
                 //以后微软拼音放开2W限制了，再把这个异常取消吧。
                 var item20000 = new WordLibraryList();
                 for(var i=0;i<wlList.Count;i++)

diff --git a/src/ImeWlConverterCore/IME/Win10MsWubi.cs b/src/ImeWlConverterCore/IME/Win10MsWubi.cs
@@ -160,12 +160,12 @@ public WordLibraryList ImportLine(string str)
         {
             throw new NotImplementedException("二进制文件不支持单个词汇的转换");
         }
-
+        public event Action<string> ExportErrorNotice;
         public IList<string> Export(WordLibraryList wlList)
         {
             //Win10拼音只支持最多32个字符的编码
             wlList = Filter(wlList);
-            string tempPath = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName) + "\\Win10微软五笔词库.dat";
+            string tempPath = Path.Combine(FileOperationHelper.GetCurrentFolderPath(), "\\Win10微软五笔词库.dat");
             if (File.Exists(tempPath)) { File.Delete(tempPath); }
             var fs = new FileStream(tempPath, FileMode.OpenOrCreate, FileAccess.Write);
             BinaryWriter bw = new BinaryWriter(fs);

diff --git a/src/ImeWlConverterCore/ImeWlConverterCore-net46.csproj b/src/ImeWlConverterCore/ImeWlConverterCore-net46.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net46</TargetFramework>
     <AssemblyName>ImeWlConverterCore</AssemblyName>
     <RootNamespace>ImeWlConverterCore</RootNamespace>
-    <Version>2.7.0</Version>
+    <Version>2.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ImeWlConverterCore/Interface.cs b/src/ImeWlConverterCore/Interface.cs
@@ -27,6 +27,7 @@ public interface IWordLibraryTextImport : IWordLibraryImport
 
     public interface IWordLibraryExport
     {
+        event Action<string> ExportErrorNotice;
         Encoding Encoding { get; }
         CodeType CodeType { get; }
         /// <summary>