alphabet settings

This commit is contained in:
AT
2019-11-16 00:34:27 +02:00
parent 8edebb9f75
commit dcb9e34d59
5 changed files with 35 additions and 4 deletions

View File

@@ -6,6 +6,7 @@ using hyjiacan.util.p4n;
using hyjiacan.util.p4n.format; using hyjiacan.util.p4n.format;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Infrastructure.Storage; using Wox.Infrastructure.Storage;
using Wox.Infrastructure.UserSettings;
namespace Wox.Infrastructure namespace Wox.Infrastructure
{ {
@@ -14,9 +15,11 @@ namespace Wox.Infrastructure
private static readonly HanyuPinyinOutputFormat Format = new HanyuPinyinOutputFormat(); private static readonly HanyuPinyinOutputFormat Format = new HanyuPinyinOutputFormat();
private static ConcurrentDictionary<string, string[][]> PinyinCache; private static ConcurrentDictionary<string, string[][]> PinyinCache;
private static BinaryStorage<ConcurrentDictionary<string, string[][]>> _pinyinStorage; private static BinaryStorage<ConcurrentDictionary<string, string[][]>> _pinyinStorage;
private static Settings _settings;
public static void Initialize() public static void Initialize(Settings settings)
{ {
_settings = settings;
Format.setToneType(HanyuPinyinToneType.WITHOUT_TONE); Format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
Stopwatch.Normal("|Wox.Infrastructure.Alphabet.Initialize|Preload pinyin cache", () => Stopwatch.Normal("|Wox.Infrastructure.Alphabet.Initialize|Preload pinyin cache", () =>
@@ -34,12 +37,20 @@ namespace Wox.Infrastructure
_pinyinStorage.Save(PinyinCache); _pinyinStorage.Save(PinyinCache);
} }
private static string[] EmptyStringArray = new string[0];
private static string[][] Empty2DStringArray = new string[0][];
/// <summary> /// <summary>
/// replace chinese character with pinyin, non chinese character won't be modified /// replace chinese character with pinyin, non chinese character won't be modified
/// <param name="word"> should be word or sentence, instead of single character. e.g. 微软 </param> /// <param name="word"> should be word or sentence, instead of single character. e.g. 微软 </param>
/// </summary> /// </summary>
public static string[] Pinyin(string word) public static string[] Pinyin(string word)
{ {
if (!_settings.ShouldUsePinyin)
{
return EmptyStringArray;
}
var pinyin = word.Select(c => var pinyin = word.Select(c =>
{ {
var pinyins = PinyinHelper.toHanyuPinyinStringArray(c); var pinyins = PinyinHelper.toHanyuPinyinStringArray(c);
@@ -57,7 +68,7 @@ namespace Wox.Infrastructure
/// </summmary> /// </summmary>
public static string[][] PinyinComination(string characters) public static string[][] PinyinComination(string characters)
{ {
if (!string.IsNullOrEmpty(characters)) if (_settings.ShouldUsePinyin && !string.IsNullOrEmpty(characters))
{ {
if (!PinyinCache.ContainsKey(characters)) if (!PinyinCache.ContainsKey(characters))
{ {
@@ -89,7 +100,7 @@ namespace Wox.Infrastructure
} }
else else
{ {
return new string[][] { }; return Empty2DStringArray;
} }
} }
@@ -101,6 +112,11 @@ namespace Wox.Infrastructure
public static bool ContainsChinese(string word) public static bool ContainsChinese(string word)
{ {
if (!_settings.ShouldUsePinyin)
{
return false;
}
var chinese = word.Select(PinyinHelper.toHanyuPinyinStringArray) var chinese = word.Select(PinyinHelper.toHanyuPinyinStringArray)
.Any(p => p != null); .Any(p => p != null);
return chinese; return chinese;
@@ -108,6 +124,11 @@ namespace Wox.Infrastructure
private static string[] Combination(string[] array1, string[] array2) private static string[] Combination(string[] array1, string[] array2)
{ {
if (!_settings.ShouldUsePinyin)
{
return EmptyStringArray;
}
var combination = ( var combination = (
from a1 in array1 from a1 in array1
from a2 in array2 from a2 in array2

View File

@@ -21,6 +21,11 @@ namespace Wox.Infrastructure.UserSettings
public string ResultFontWeight { get; set; } public string ResultFontWeight { get; set; }
public string ResultFontStretch { get; set; } public string ResultFontStretch { get; set; }
/// <summary>
/// when false Alphabet static service will always return empty results
/// </summary>
public bool ShouldUsePinyin { get; set; } = true;
private string _querySearchPrecision { get; set; } = StringMatcher.SearchPrecisionScore.Regular.ToString(); private string _querySearchPrecision { get; set; } = StringMatcher.SearchPrecisionScore.Regular.ToString();
public string QuerySearchPrecision public string QuerySearchPrecision
{ {

View File

@@ -49,11 +49,12 @@ namespace Wox
RegisterDispatcherUnhandledException(); RegisterDispatcherUnhandledException();
ImageLoader.Initialize(); ImageLoader.Initialize();
Alphabet.Initialize();
_settingsVM = new SettingWindowViewModel(); _settingsVM = new SettingWindowViewModel();
_settings = _settingsVM.Settings; _settings = _settingsVM.Settings;
Alphabet.Initialize(_settings);
StringMatcher.UserSettingSearchPrecision = _settings.QuerySearchPrecision; StringMatcher.UserSettingSearchPrecision = _settings.QuerySearchPrecision;
PluginManager.LoadPlugins(_settings.PluginSettings); PluginManager.LoadPlugins(_settings.PluginSettings);

View File

@@ -34,6 +34,7 @@
<system:String x:Key="hideOnStartup">Hide Wox on startup</system:String> <system:String x:Key="hideOnStartup">Hide Wox on startup</system:String>
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String> <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String> <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
<system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
<!--Setting Plugin--> <!--Setting Plugin-->
<system:String x:Key="plugin">Plugin</system:String> <system:String x:Key="plugin">Plugin</system:String>

View File

@@ -55,6 +55,9 @@
Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck"> Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck">
<TextBlock Text="{DynamicResource autoUpdates}" /> <TextBlock Text="{DynamicResource autoUpdates}" />
</CheckBox> </CheckBox>
<CheckBox Margin="10" IsChecked="{Binding Settings.ShouldUsePinyin}">
<TextBlock Text="{DynamicResource ShouldUsePinyin}" />
</CheckBox>
<StackPanel Margin="10" Orientation="Horizontal"> <StackPanel Margin="10" Orientation="Horizontal">
<TextBlock Text="{DynamicResource querySearchPrecision}" /> <TextBlock Text="{DynamicResource querySearchPrecision}" />
<ComboBox Margin="10 0 0 0" Width="120" <ComboBox Margin="10 0 0 0" Width="120"