mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-13 19:19:23 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Refactoring Query Dispatch

Browse Source 
half lines of code :)
This commit is contained in:
bao-qian 2015-11-01 17:25:44 +00:00
parent f3038e4fef
commit bb3b982dea
9 changed files with 66 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
@ -90,7 +91,7 @@ namespace Wox.Core.Plugin
{
Stopwatch sw = new Stopwatch();
sw.Start();
pair.Plugin.Init(new PluginInitContext()
pair.Plugin.Init(new PluginInitContext
{
CurrentPluginMetadata = pair.Metadata,
Proxy = HttpProxy.Instance,
@ -114,7 +115,7 @@ namespace Wox.Core.Plugin
PluginInstaller.Install(path);
}
public static void Query(Query query)
public static void QueryForAllPlugins(Query query)
{
query.ActionKeyword = string.Empty;
query.Search = query.RawQuery;
@ -125,9 +126,38 @@ namespace Wox.Core.Plugin
}
if (!string.IsNullOrEmpty(query.ActionKeyword))
{
query.Search = string.Join(Wox.Plugin.Query.Seperater, query.Terms.Skip(1).ToArray());
query.Search = string.Join(Query.Seperater, query.Terms.Skip(1).ToArray());
}
QueryDispatch(query);
}
private static void QueryDispatch(Query query)
{
var pluginPairs = IsExclusivePluginQuery(query) ? GetExclusivePlugins(query) : GetGenericPlugins();
foreach (var plugin in pluginPairs)
{
var customizedPluginConfig = UserSettingStorage.Instance.
CustomizedPluginConfigs.FirstOrDefault(o => o.ID == plugin.Metadata.ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled)
{
return;
}
if (query.IsIntantQuery && IsInstantSearchPlugin(plugin.Metadata))
{
Debug.WriteLine(string.Format("Plugin {0} is executing instant search.", plugin.Metadata.Name));
using (new Timeit(" => instant search took: "))
{
QueryForPlugin(plugin, query);
}
}
else
{
ThreadPool.QueueUserWorkItem(state =>
{
QueryForPlugin(plugin, query);
});
}
}
QueryDispatcher.QueryDispatcher.Dispatch(query);
}
public static List<PluginPair> AllPlugins
@ -170,14 +200,14 @@ namespace Wox.Core.Plugin
return LoadInstantSearches().Any(o => o.Value.IsInstantQuery(query));
}
public static bool IsInstantSearchPlugin(PluginMetadata pluginMetadata)
private static bool IsInstantSearchPlugin(PluginMetadata pluginMetadata)
{
//todo:to improve performance, any instant search plugin that takes long than 200ms will not consider a instant plugin anymore
return pluginMetadata.Language.ToUpper() == AllowedLanguage.CSharp &&
LoadInstantSearches().Any(o => o.Key.Metadata.ID == pluginMetadata.ID);
}
internal static void ExecutePluginQuery(PluginPair pair, Query query)
private static void QueryForPlugin(PluginPair pair, Query query)
{
try
{
@ -223,23 +253,23 @@ namespace Wox.Core.Plugin
/// <returns></returns>
public static PluginPair GetPlugin(string id)
{
return AllPlugins.FirstOrDefault(o => o.Metadata.ID == id);
return plugins.FirstOrDefault(o => o.Metadata.ID == id);
}
internal static List<KeyValuePair<PluginPair, IExclusiveQuery>> LoadExclusiveSearchPlugins()
private static List<KeyValuePair<PluginPair, IExclusiveQuery>> LoadExclusiveSearchPlugins()
{
if (exclusiveSearchPlugins != null) return exclusiveSearchPlugins;
exclusiveSearchPlugins = AssemblyHelper.LoadPluginInterfaces<IExclusiveQuery>();
return exclusiveSearchPlugins;
}
internal static PluginPair GetExclusivePlugin(Query query)
private static PluginPair GetExclusivePlugin(Query query)
{
KeyValuePair<PluginPair, IExclusiveQuery> plugin = LoadExclusiveSearchPlugins().FirstOrDefault(o => o.Value.IsExclusiveQuery((query)));
return plugin.Key;
}
internal static PluginPair GetActionKeywordPlugin(Query 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;
@ -260,7 +290,26 @@ namespace Wox.Core.Plugin
return null;
}
internal static bool IsExclusivePluginQuery(Query query)
private static List<PluginPair> GetExclusivePlugins(Query query)
{
List<PluginPair> pluginPairs = new List<PluginPair>();
var exclusivePluginPair = GetExclusivePlugin(query) ??
GetActionKeywordPlugin(query);
if (exclusivePluginPair != null)
{
pluginPairs.Add(exclusivePluginPair);
}
return pluginPairs;
}
private static List<PluginPair> GetGenericPlugins()
{
return plugins.Where(o => IsGenericPlugin(o.Metadata)).ToList();
}
private static bool IsExclusivePluginQuery(Query query)
{
return GetExclusivePlugin(query) != null || GetActionKeywordPlugin(query) != null;
}
@ -293,5 +342,6 @@ namespace Wox.Core.Plugin
return contextContextMenus;
}
}
}

44
Wox.Core/Plugin/QueryDispatcher/BaseQueryDispatcher.cs
View File

@ -1,44 +0,0 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using Wox.Core.UserSettings;
using Wox.Infrastructure;
using Wox.Plugin;
namespace Wox.Core.Plugin.QueryDispatcher
{
public abstract class BaseQueryDispatcher : IQueryDispatcher
{
protected abstract List<PluginPair> GetPlugins(Query query);
public void Dispatch(Query query)
{
foreach (PluginPair pair in GetPlugins(query))
{
var customizedPluginConfig = UserSettingStorage.Instance.
CustomizedPluginConfigs.FirstOrDefault(o => o.ID == pair.Metadata.ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled)
{
return;
}
PluginPair localPair = pair;
if (query.IsIntantQuery && PluginManager.IsInstantSearchPlugin(pair.Metadata))
{
Debug.WriteLine(string.Format("Plugin {0} is executing instant search.", pair.Metadata.Name));
using (new Timeit(" => instant search took: "))
{
PluginManager.ExecutePluginQuery(localPair, query);
}
}
else
{
ThreadPool.QueueUserWorkItem(state =>
{
PluginManager.ExecutePluginQuery(localPair, query);
});
}
}
}
}
}

24
Wox.Core/Plugin/QueryDispatcher/ExclusiveQueryDispatcher.cs
View File

@ -1,24 +0,0 @@
using System.Collections.Generic;
using Wox.Plugin;
namespace Wox.Core.Plugin.QueryDispatcher
{
public class ExclusiveQueryDispatcher : BaseQueryDispatcher
{
protected override List<PluginPair> GetPlugins(Query query)
{
List<PluginPair> pluginPairs = new List<PluginPair>();
var exclusivePluginPair = PluginManager.GetExclusivePlugin(query) ??
PluginManager.GetActionKeywordPlugin(query);
if (exclusivePluginPair != null)
{
pluginPairs.Add(exclusivePluginPair);
}
return pluginPairs;
}
}
}

14
Wox.Core/Plugin/QueryDispatcher/GenericQueryDispatcher.cs
View File

@ -1,14 +0,0 @@
using System.Collections.Generic;
using System.Linq;
using Wox.Plugin;
namespace Wox.Core.Plugin.QueryDispatcher
{
public class GenericQueryDispatcher : BaseQueryDispatcher
{
protected override List<PluginPair> GetPlugins(Query query)
{
return PluginManager.AllPlugins.Where(o => PluginManager.IsGenericPlugin(o.Metadata)).ToList();
}
}
}

7
Wox.Core/Plugin/QueryDispatcher/IQueryDispatcher.cs
View File

@ -1,7 +0,0 @@
namespace Wox.Core.Plugin.QueryDispatcher
{
internal interface IQueryDispatcher
{
void Dispatch(Wox.Plugin.Query query);
}
}

23
Wox.Core/Plugin/QueryDispatcher/QueryDispatcher.cs
View File

@ -1,23 +0,0 @@

using Wox.Plugin;
namespace Wox.Core.Plugin.QueryDispatcher
{
internal static class QueryDispatcher
{
private static readonly IQueryDispatcher exclusivePluginDispatcher = new ExclusiveQueryDispatcher();
private static readonly IQueryDispatcher genericQueryDispatcher = new GenericQueryDispatcher();
public static void Dispatch(Query query)
{
if (PluginManager.IsExclusivePluginQuery(query))
{
exclusivePluginDispatcher.Dispatch(query);
}
else
{
genericQueryDispatcher.Dispatch(query);
}
}
}
}

8
Wox.Core/Wox.Core.csproj
View File

@ -65,7 +65,6 @@
<Compile Include="Exception\WoxJsonRPCException.cs" />
<Compile Include="Exception\WoxPluginException.cs" />
<Compile Include="AssemblyHelper.cs" />
<Compile Include="Plugin\QueryDispatcher\BaseQueryDispatcher.cs" />
<Compile Include="Updater\Release.cs" />
<Compile Include="Updater\UpdaterManager.cs" />
<Compile Include="Updater\WoxUpdateSource.cs" />
@ -80,10 +79,6 @@
<Compile Include="UI\IUIResource.cs" />
<Compile Include="UI\ResourceMerger.cs" />
<Compile Include="Plugin\PluginInstaller.cs" />
<Compile Include="Plugin\QueryDispatcher\IQueryDispatcher.cs" />
<Compile Include="Plugin\QueryDispatcher\QueryDispatcher.cs" />
<Compile Include="Plugin\QueryDispatcher\ExclusiveQueryDispatcher.cs" />
<Compile Include="Plugin\QueryDispatcher\GenericQueryDispatcher.cs" />
<Compile Include="Plugin\JsonRPCPlugin.cs" />
<Compile Include="Plugin\JsonRPCPluginLoader.cs" />
<Compile Include="Plugin\CSharpPluginLoader.cs" />
@ -123,5 +118,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

4
Wox.Plugin/PluginPair.cs
View File

@ -2,8 +2,8 @@
{
public class PluginPair
{
public IPlugin Plugin { get; set; }
public PluginMetadata Metadata { get; set; }
public IPlugin Plugin { get; internal set; }
public PluginMetadata Metadata { get; internal set; }
internal long InitTime { get; set; }

2
Wox/MainWindow.xaml.cs
View File

@ -501,7 +501,7 @@ namespace Wox
private void Query(Query q)
{
PluginManager.Query(q);
PluginManager.QueryForAllPlugins(q);
StopProgress();
}