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

Enable multiple action keywords

Browse Source 
See issue #352
This commit is contained in:
bao-qian
2015-11-04 22:49:40 +00:00
parent 59a4abff7c
commit a07d6aa1e7
25 changed files with 95 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Wox.Core/Plugin/PluginConfig.cs
View File

@@ -72,6 +72,10 @@ namespace Wox.Core.Plugin
{
metadata = JsonConvert.DeserializeObject<PluginMetadata>(File.ReadAllText(configPath));
metadata.PluginDirectory = pluginDirectory;
// for plugins which doesn't has ActionKeywords key
metadata.ActionKeywords = metadata.ActionKeywords ?? new[] {metadata.ActionKeyword};
// for plugin still use old ActionKeyword
metadata.ActionKeyword = metadata.ActionKeywords?[0];
}
catch (System.Exception)
{
@@ -112,9 +116,10 @@ namespace Wox.Core.Plugin
//replace action keyword if user customized it.
var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == metadata.ID);
if (customizedPluginConfig != null && !string.IsNullOrEmpty(customizedPluginConfig.Actionword))
if (customizedPluginConfig?.ActionKeywords?.Length > 0)
{
metadata.ActionKeyword = customizedPluginConfig.Actionword;
metadata.ActionKeywords = customizedPluginConfig.ActionKeywords;
metadata.ActionKeyword = customizedPluginConfig.ActionKeywords[0]; //todo reenable
}
return metadata;

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

@@ -1,11 +1,9 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Windows.Documents;
using Wox.Core.Exception;
using Wox.Core.i18n;
using Wox.Core.UI;
@@ -110,7 +108,6 @@ namespace Wox.Core.Plugin
ThreadPool.QueueUserWorkItem(o =>
{
instantQueryPlugins = GetPlugins<IInstantQuery>();
exclusiveSearchPlugins = GetPlugins<IExclusiveQuery>();
contextMenuPlugins = GetPlugins<IContextMenu>();
});
}
@@ -123,8 +120,8 @@ namespace Wox.Core.Plugin
public static Query QueryInit(string text) //todo is that possible to move it into type Query?
{
// replace multiple white spaces with one white space
var terms = text.Split(new[] { Query.Seperater }, StringSplitOptions.RemoveEmptyEntries);
var rawQuery = string.Join(Query.Seperater, terms.ToArray());
var terms = text.Split(new[] { Query.TermSeperater }, StringSplitOptions.RemoveEmptyEntries);
var rawQuery = string.Join(Query.TermSeperater, terms.ToArray());
var actionKeyword = string.Empty;
var search = rawQuery;
IEnumerable<string> actionParameters = terms;
@@ -136,7 +133,7 @@ namespace Wox.Core.Plugin
if (!string.IsNullOrEmpty(actionKeyword))
{
actionParameters = terms.Skip(1);
search = string.Join(Query.Seperater, actionParameters.ToArray());
search = string.Join(Query.TermSeperater, actionParameters.ToArray());
}
return new Query
{
@@ -204,7 +201,7 @@ namespace Wox.Core.Plugin
private static bool IsVailldActionKeyword(string actionKeyword)
{
if (string.IsNullOrEmpty(actionKeyword) || actionKeyword == Query.WildcardSign) return false;
PluginPair pair = AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == actionKeyword);
PluginPair pair = AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeywords.Contains(actionKeyword));
if (pair == null) return false;
var customizedPluginConfig = UserSettingStorage.Instance.
CustomizedPluginConfigs.FirstOrDefault(o => o.ID == pair.Metadata.ID);
@@ -213,7 +210,7 @@ namespace Wox.Core.Plugin
public static bool IsSystemPlugin(PluginMetadata metadata)
{
return metadata.ActionKeyword == Query.WildcardSign;
return metadata.ActionKeywords.Contains(Query.WildcardSign);
}
private static bool IsInstantQueryPlugin(PluginPair plugin)
@@ -239,21 +236,11 @@ namespace Wox.Core.Plugin
return AllPlugins.Where(p => p.Plugin is T);
}
private static PluginPair GetExclusivePlugin(Query query)
{
return exclusiveSearchPlugins.FirstOrDefault(p => ((IExclusiveQuery)p.Plugin).IsExclusiveQuery(query));
}
private static PluginPair GetActionKeywordPlugin(Query query)
{
//if a query doesn't contain a vaild action keyword, it should not be a action keword plugin query
if (string.IsNullOrEmpty(query.ActionKeyword)) return null;
return AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == query.ActionKeyword);
}
private static PluginPair GetNonSystemPlugin(Query query)
{
return GetExclusivePlugin(query) ?? GetActionKeywordPlugin(query);
//if a query doesn't contain a vaild action keyword, it should be a query for system plugin
if (string.IsNullOrEmpty(query.ActionKeyword)) return null;
return AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeywords.Contains(query.ActionKeyword));
}
private static List<PluginPair> GetSystemPlugins()

3
Wox.Core/UserSettings/CustomizedPluginConfig.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
namespace Wox.Core.UserSettings
{
@@ -9,7 +10,7 @@ namespace Wox.Core.UserSettings
public string Name { get; set; }
public string Actionword { get; set; }
public string[] ActionKeywords { get; set; }
public bool Disabled { get; set; }
}