Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix regressive issues

Browse Source
This commit is contained in:
qianlifeng
2015-02-06 18:13:22 +08:00
parent 02e22e5781
commit 998eecb94d
5 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Wox.Core/Plugin/PluginManager.cs
View File

@@ -131,7 +131,7 @@ namespace Wox.Core.Plugin
}
/// <summary>
/// Check if a query contains action keyword
/// Check if a query contains valid action keyword
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -144,7 +144,19 @@ namespace Wox.Core.Plugin
var actionKeyword = strings[0].Trim();
if (string.IsNullOrEmpty(actionKeyword)) return false;
return plugins.Any(o => o.Metadata.ActionKeyword == actionKeyword);
PluginPair pair = plugins.FirstOrDefault(o => o.Metadata.ActionKeyword == actionKeyword);
if (pair != null)
{
var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == pair.Metadata.ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled)
{
return false;
}
return true;
}
return false;
}
public static bool IsGenericPlugin(PluginMetadata metadata)
@@ -292,15 +304,17 @@ namespace Wox.Core.Plugin
internal static PluginPair GetActionKeywordPlugin(Query query)
{
PluginPair exclusivePluginPair = AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == query.GetActionKeyword());
if (exclusivePluginPair != null)
PluginPair actionKeywordPluginPair = AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == query.GetActionKeyword());
if (actionKeywordPluginPair != null)
{
var customizedPluginConfig = UserSettingStorage.Instance.
CustomizedPluginConfigs.FirstOrDefault(o => o.ID == exclusivePluginPair.Metadata.ID);
if (customizedPluginConfig != null && !customizedPluginConfig.Disabled)
CustomizedPluginConfigs.FirstOrDefault(o => o.ID == actionKeywordPluginPair.Metadata.ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled)
{
return exclusivePluginPair;
return null;
}
return actionKeywordPluginPair;
}
return null;