prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge DoublePinAlphabet logic

Browse source
This commit is contained in:
VictoriousRaptor 2024-06-02 14:19:27 +08:00
parent 6807afbe6d
commit a2efa11699
4 changed files with 121 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

194
Flow.Launcher.Infrastructure/DoublePinAlphabet.cs
View file

@ -1,194 +0,0 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text;
using Flow.Launcher.Infrastructure.UserSettings;
using ToolGood.Words.Pinyin;
namespace Flow.Launcher.Infrastructure
{
public class DoublePinAlphabet : IAlphabet
{
private ConcurrentDictionary<string, (string translation, TranslationMapping map)> _doublePinCache =
new ConcurrentDictionary<string, (string translation, TranslationMapping map)>();
private Settings _settings;
public void Initialize([NotNull] Settings settings)
{
_settings = settings ?? throw new ArgumentNullException(nameof(settings));
}
public bool ShouldTranslate(string stringToTranslate)
{
return stringToTranslate.Length % 2 == 0 && !WordsHelper.HasChinese(stringToTranslate);
}
public (string translation, TranslationMapping map) Translate(string content)
{
if (_settings.ShouldUsePinyin)
{
if (!_doublePinCache.ContainsKey(content))
{
return BuildCacheFromContent(content);
}
else
{
return _doublePinCache[content];
}
}
return (content, null);
}
private (string translation, TranslationMapping map) BuildCacheFromContent(string content)
{
if (WordsHelper.HasChinese(content))
{
var resultList = WordsHelper.GetPinyinList(content);
StringBuilder resultBuilder = new StringBuilder();
TranslationMapping map = new TranslationMapping();
bool pre = false;
for (int i = 0; i < resultList.Length; i++)
{
if (content[i] >= 0x3400 && content[i] <= 0x9FD5)
{
string dp = _settings.ShouldUseDoublePin ? ToDoublePin(resultList[i].ToLower()) : resultList[i];
map.AddNewIndex(i, resultBuilder.Length, dp.Length + 1);
resultBuilder.Append(' ');
resultBuilder.Append(dp);
pre = true;
}
else
{
if (pre)
{
pre = false;
resultBuilder.Append(' ');
}
resultBuilder.Append(resultList[i]);
}
}
map.endConstruct();
var key = resultBuilder.ToString();
map.setKey(key);
return _doublePinCache[content] = (key, map);
}
else
{
return (content, null);
}
}
private static readonly ReadOnlyDictionary<string, string> special = new(new Dictionary<string, string>(){
{"a", "aa"},
{"ai", "ai"},
{"an", "an"},
{"ang", "ah"},
{"ao", "ao"},
{"e", "ee"},
{"ei", "ei"},
{"en", "en"},
{"er", "er"},
{"o", "oo"},
{"ou", "ou"}
});
private static readonly ReadOnlyDictionary<string, string> first = new(new Dictionary<string, string>(){
{"ch", "i"},
{"sh", "u"},
{"zh", "v"}
});
private static readonly ReadOnlyDictionary<string, string> second = new(new Dictionary<string, string>()
{
{"ua", "x"},
{"ei", "w"},
{"e", "e"},
{"ou", "z"},
{"iu", "q"},
{"ve", "t"},
{"ue", "t"},
{"u", "u"},
{"i", "i"},
{"o", "o"},
{"uo", "o"},
{"ie", "p"},
{"a", "a"},
{"ong", "s"},
{"iong", "s"},
{"ai", "d"},
{"ing", "k"},
{"uai", "k"},
{"ang", "h"},
{"uan", "r"},
{"an", "j"},
{"en", "f"},
{"ia", "x"},
{"iang", "l"},
{"uang", "l"},
{"eng", "g"},
{"in", "b"},
{"ao", "c"},
{"v", "v"},
{"ui", "v"},
{"un", "y"},
{"iao", "n"},
{"ian", "m"}
});
private static string ToDoublePin(string fullPinyin)
{
// Assuming s is valid
StringBuilder doublePin = new StringBuilder();
if (fullPinyin.Length <= 3 && (fullPinyin[0] == 'a' || fullPinyin[0] == 'e' || fullPinyin[0] == 'o'))
{
if (special.ContainsKey(fullPinyin))
{
return special[fullPinyin];
}
}
// zh, ch, sh
if (fullPinyin.Length >= 2 && first.ContainsKey(fullPinyin[..2]))
{
doublePin.Append(first[fullPinyin[..2]]);
if (second.TryGetValue(fullPinyin[2..], out string tmp))
{
doublePin.Append(tmp);
}
else
{
doublePin.Append(fullPinyin[2..]);
}
}
else
{
doublePin.Append(fullPinyin[0]);
if (second.TryGetValue(fullPinyin[1..], out string tmp))
{
doublePin.Append(tmp);
}
else
{
doublePin.Append(fullPinyin[1..]);
}
}
return doublePin.ToString();
}
}
}

127
Flow.Launcher.Infrastructure/PinyinAlphabet.cs
View file

@ -1,18 +1,18 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using JetBrains.Annotations;
using Flow.Launcher.Infrastructure.UserSettings;
using ToolGood.Words.Pinyin;
using System.Collections.Generic;
using System.Collections.ObjectModel;
namespace Flow.Launcher.Infrastructure
{
public class PinyinAlphabet : IAlphabet
{
private ConcurrentDictionary<string, (string translation, TranslationMapping map)> _pinyinCache =
new ConcurrentDictionary<string, (string translation, TranslationMapping map)>();
private readonly ConcurrentDictionary<string, (string translation, TranslationMapping map)> _pinyinCache =
new();
private Settings _settings;
@ -23,20 +23,22 @@ namespace Flow.Launcher.Infrastructure
public bool ShouldTranslate(string stringToTranslate)
{
return WordsHelper.HasChinese(stringToTranslate);
return _settings.UseDoublePinyin ?
(WordsHelper.HasChinese(stringToTranslate) && stringToTranslate.Length % 2 == 0) :
WordsHelper.HasChinese(stringToTranslate);
}
public (string translation, TranslationMapping map) Translate(string content)
{
if (_settings.ShouldUsePinyin)
{
if (!_pinyinCache.ContainsKey(content))
if (!_pinyinCache.TryGetValue(content, out var value))
{
return BuildCacheFromContent(content);
}
else
{
return _pinyinCache[content];
return value;
}
}
return (content, null);
@ -57,9 +59,10 @@ namespace Flow.Launcher.Infrastructure
{
if (content[i] >= 0x3400 && content[i] <= 0x9FD5)
{
map.AddNewIndex(i, resultBuilder.Length, resultList[i].Length + 1);
string dp = _settings.UseDoublePinyin ? ToDoublePin(resultList[i].ToLower()) : resultList[i];
map.AddNewIndex(i, resultBuilder.Length, dp.Length + 1);
resultBuilder.Append(' ');
resultBuilder.Append(resultList[i]);
resultBuilder.Append(dp);
pre = true;
}
else
@ -86,5 +89,111 @@ namespace Flow.Launcher.Infrastructure
return (content, null);
}
}
#region Double Pinyin
private static readonly ReadOnlyDictionary<string, string> special = new(new Dictionary<string, string>(){
{"a", "aa"},
{"ai", "ai"},
{"an", "an"},
{"ang", "ah"},
{"ao", "ao"},
{"e", "ee"},
{"ei", "ei"},
{"en", "en"},
{"er", "er"},
{"o", "oo"},
{"ou", "ou"}
});
private static readonly ReadOnlyDictionary<string, string> first = new(new Dictionary<string, string>(){
{"ch", "i"},
{"sh", "u"},
{"zh", "v"}
});
private static readonly ReadOnlyDictionary<string, string> second = new(new Dictionary<string, string>()
{
{"ua", "x"},
{"ei", "w"},
{"e", "e"},
{"ou", "z"},
{"iu", "q"},
{"ve", "t"},
{"ue", "t"},
{"u", "u"},
{"i", "i"},
{"o", "o"},
{"uo", "o"},
{"ie", "p"},
{"a", "a"},
{"ong", "s"},
{"iong", "s"},
{"ai", "d"},
{"ing", "k"},
{"uai", "k"},
{"ang", "h"},
{"uan", "r"},
{"an", "j"},
{"en", "f"},
{"ia", "x"},
{"iang", "l"},
{"uang", "l"},
{"eng", "g"},
{"in", "b"},
{"ao", "c"},
{"v", "v"},
{"ui", "v"},
{"un", "y"},
{"iao", "n"},
{"ian", "m"}
});
private static string ToDoublePin(string fullPinyin)
{
// Assuming s is valid
StringBuilder doublePin = new StringBuilder();
if (fullPinyin.Length <= 3 && (fullPinyin[0] == 'a' || fullPinyin[0] == 'e' || fullPinyin[0] == 'o'))
{
if (special.TryGetValue(fullPinyin, out var value))
{
return value;
}
}
// zh, ch, sh
if (fullPinyin.Length >= 2 && first.ContainsKey(fullPinyin[..2]))
{
doublePin.Append(first[fullPinyin[..2]]);
if (second.TryGetValue(fullPinyin[2..], out string tmp))
{
doublePin.Append(tmp);
}
else
{
doublePin.Append(fullPinyin[2..]);
}
}
else
{
doublePin.Append(fullPinyin[0]);
if (second.TryGetValue(fullPinyin[1..], out string tmp))
{
doublePin.Append(tmp);
}
else
{
doublePin.Append(fullPinyin[1..]);
}
}
return doublePin.ToString();
}
#endregion
}
}

3
Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file

@ -186,7 +186,8 @@ namespace Flow.Launcher.Infrastructure.UserSettings
/// </summary>
public bool ShouldUsePinyin { get; set; } = false;
public bool ShouldUseDoublePin { get; set; } = false;
public bool UseDoublePinyin { get; set; } = false;
public bool AlwaysPreview { get; set; } = false;
public bool AlwaysStartEn { get; set; } = false;

2
Flow.Launcher/App.xaml.cs
View file

@ -30,7 +30,7 @@ namespace Flow.Launcher
private SettingWindowViewModel _settingsVM;
private readonly Updater _updater = new Updater(Flow.Launcher.Properties.Settings.Default.GithubRepo);
private readonly Portable _portable = new Portable();
private readonly DoublePinAlphabet _alphabet = new DoublePinAlphabet();
private readonly PinyinAlphabet _alphabet = new PinyinAlphabet();
private StringMatcher _stringMatcher;
[STAThread]