Fix #86, allow both Ch and En code in Emoji.

studyzy · Jun 8, 2019 · 711673a · 711673a
1 parent 08fa93f
commit 711673a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/src/ImeWlConverterCore/Filters/XiaoheShuangpinReplacer.cs b/src/ImeWlConverterCore/Filters/XiaoheShuangpinReplacer.cs
@@ -31,6 +31,10 @@ public XiaoheShuangpinReplacer()
 
         public void Replace(WordLibrary wl)
         {
+            if(wl.CodeType!=CodeType.Pinyin)//必须是拼音才能被双拼替换
+            {
+                return;
+            }
            foreach(var code in wl.Codes)
             {
                 for(var i=0;i<code.Count;i++)

diff --git a/src/ImeWlConverterCore/IME/Emoji.cs b/src/ImeWlConverterCore/IME/Emoji.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace Studyzy.IMEWLConverter.IME
@@ -33,10 +34,20 @@ public WordLibraryList ImportLine(string line)
             var wl = new WordLibrary();
             wl.Word = line.Split('\t')[1];
             wl.CodeType = CodeType;
+            wl.IsEnglish = IsEnglish(wl.Word);
+            if (wl.IsEnglish)
+            {
+                wl.SetCode(CodeType.English, wl.Word);
+            }
             var wll = new WordLibraryList();
             wll.Add(wl);
             return wll;
         }
+        private static Regex regex = new Regex("^[a-zA-Z]+$");
+        private bool IsEnglish(string word)
+        {
+            return regex.IsMatch(word);
+        }
 
         public WordLibraryList ImportText(string text)
         {

diff --git a/src/ImeWlConverterCore/MainBody.cs b/src/ImeWlConverterCore/MainBody.cs
@@ -290,6 +290,11 @@ private void GenerateDestinationCode(WordLibraryList wordLibraryList, CodeType c
                 {
                     continue;
                 }
+                if (wordLibrary.CodeType == CodeType.English)
+                {
+                    wordLibrary.SetCode(CodeType.English, wordLibrary.Word.ToLower());
+                    continue;
+                }
                 try
                 {
                     generater.GetCodeOfWordLibrary(wordLibrary);