From 42d86fab8e788d4ba99f5f07031aca536ad904bf Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Fri, 23 Jan 2015 20:49:00 +0800 Subject: [PATCH] make some renames --- Deploy/Cleanup.bat | 1 + .../Wox.Plugin.PluginIndicator/PluginIndicator.cs | 2 +- Plugins/Wox.Plugin.PluginManagement/Main.cs | 6 +++--- Wox.Core/Plugin/PluginManager.cs | 8 +++++--- Wox.Core/Plugin/QueryDispatcher/QueryDispatcher.cs | 6 +++--- ...spatcher.cs => RegularPluginQueryDispatcher.cs} | 14 +++++++------- ...patcher.cs => WildcardPluginQueryDispatcher.cs} | 5 ++--- 7 files changed, 22 insertions(+), 20 deletions(-) rename Wox.Core/Plugin/QueryDispatcher/{UserPluginQueryDispatcher.cs => RegularPluginQueryDispatcher.cs} (57%) rename Wox.Core/Plugin/QueryDispatcher/{SystemPluginQueryDispatcher.cs => WildcardPluginQueryDispatcher.cs} (86%) diff --git a/Deploy/Cleanup.bat b/Deploy/Cleanup.bat index 698395cc15..5c5a581362 100644 --- a/Deploy/Cleanup.bat +++ b/Deploy/Cleanup.bat @@ -1,3 +1,4 @@ +echo "start clean" cd /d %~dp0 REM Clean Plugins diff --git a/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs b/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs index 124ef26669..a3df11cc87 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs +++ b/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs @@ -17,7 +17,7 @@ namespace Wox.Plugin.PluginIndicator if (allPlugins.Count == 0) { - allPlugins = context.API.GetAllPlugins().Where(o => !PluginManager.IsSystemPlugin(o.Metadata)).ToList(); + allPlugins = context.API.GetAllPlugins().Where(o => !PluginManager.IsWildcardPlugin(o.Metadata)).ToList(); } foreach (PluginMetadata metadata in allPlugins.Select(o => o.Metadata)) diff --git a/Plugins/Wox.Plugin.PluginManagement/Main.cs b/Plugins/Wox.Plugin.PluginManagement/Main.cs index a2153610d7..fcdb5ae863 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Main.cs +++ b/Plugins/Wox.Plugin.PluginManagement/Main.cs @@ -197,7 +197,7 @@ namespace Wox.Plugin.PluginManagement private List ListUnInstalledPlugins(Query query) { List results = new List(); - List allInstalledPlugins = ParseUserPlugins(); + List allInstalledPlugins = ParseRegularPlugins(); if (query.ActionParameters.Count > 1) { string pluginName = query.ActionParameters[1]; @@ -235,7 +235,7 @@ namespace Wox.Plugin.PluginManagement private List ListInstalledPlugins() { List results = new List(); - foreach (PluginMetadata plugin in ParseUserPlugins()) + foreach (PluginMetadata plugin in ParseRegularPlugins()) { results.Add(new Result() { @@ -247,7 +247,7 @@ namespace Wox.Plugin.PluginManagement return results; } - private static List ParseUserPlugins() + private static List ParseRegularPlugins() { List pluginMetadatas = new List(); if (!Directory.Exists(PluginPath)) diff --git a/Wox.Core/Plugin/PluginManager.cs b/Wox.Core/Plugin/PluginManager.cs index e8c942f950..886bc7cb89 100644 --- a/Wox.Core/Plugin/PluginManager.cs +++ b/Wox.Core/Plugin/PluginManager.cs @@ -19,6 +19,8 @@ namespace Wox.Core.Plugin /// public static class PluginManager { + public const string ActionKeywordWildcard = "*"; + public static String DebuggerMode { get; private set; } public static IPublicAPI API { get; private set; } @@ -113,16 +115,16 @@ namespace Wox.Core.Plugin } } - public static bool IsUserPluginQuery(Query query) + public static bool IsRegularPluginQuery(Query query) { if (string.IsNullOrEmpty(query.ActionName)) return false; return plugins.Any(o => o.Metadata.PluginType == PluginType.User && o.Metadata.ActionKeyword == query.ActionName); } - public static bool IsSystemPlugin(PluginMetadata metadata) + public static bool IsWildcardPlugin(PluginMetadata metadata) { - return metadata.ActionKeyword == "*"; + return metadata.ActionKeyword == ActionKeywordWildcard; } public static void ActivatePluginDebugger(string path) diff --git a/Wox.Core/Plugin/QueryDispatcher/QueryDispatcher.cs b/Wox.Core/Plugin/QueryDispatcher/QueryDispatcher.cs index 0e0eb62fb9..cb27b232a9 100644 --- a/Wox.Core/Plugin/QueryDispatcher/QueryDispatcher.cs +++ b/Wox.Core/Plugin/QueryDispatcher/QueryDispatcher.cs @@ -3,12 +3,12 @@ namespace Wox.Core.Plugin.QueryDispatcher { internal static class QueryDispatcher { - private static IQueryDispatcher pluginCmd = new UserPluginQueryDispatcher(); - private static IQueryDispatcher systemCmd = new SystemPluginQueryDispatcher(); + private static IQueryDispatcher pluginCmd = new RegularPluginQueryDispatcher(); + private static IQueryDispatcher systemCmd = new WildcardPluginQueryDispatcher(); public static void Dispatch(Wox.Plugin.Query query) { - if (PluginManager.IsUserPluginQuery(query)) + if (PluginManager.IsRegularPluginQuery(query)) { pluginCmd.Dispatch(query); } diff --git a/Wox.Core/Plugin/QueryDispatcher/UserPluginQueryDispatcher.cs b/Wox.Core/Plugin/QueryDispatcher/RegularPluginQueryDispatcher.cs similarity index 57% rename from Wox.Core/Plugin/QueryDispatcher/UserPluginQueryDispatcher.cs rename to Wox.Core/Plugin/QueryDispatcher/RegularPluginQueryDispatcher.cs index 9b42179633..ace7a59174 100644 --- a/Wox.Core/Plugin/QueryDispatcher/UserPluginQueryDispatcher.cs +++ b/Wox.Core/Plugin/QueryDispatcher/RegularPluginQueryDispatcher.cs @@ -9,14 +9,14 @@ using Wox.Plugin; namespace Wox.Core.Plugin.QueryDispatcher { - public class UserPluginQueryDispatcher : IQueryDispatcher + public class RegularPluginQueryDispatcher : IQueryDispatcher { public void Dispatch(Query query) { - PluginPair userPlugin = PluginManager.AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == query.ActionName); - if (userPlugin != null && !string.IsNullOrEmpty(userPlugin.Metadata.ActionKeyword)) + PluginPair regularPlugin = PluginManager.AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == query.ActionName); + if (regularPlugin != null && !string.IsNullOrEmpty(regularPlugin.Metadata.ActionKeyword)) { - var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == userPlugin.Metadata.ID); + var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == regularPlugin.Metadata.ID); if (customizedPluginConfig != null && customizedPluginConfig.Disabled) { //need to stop the loading animation @@ -28,12 +28,12 @@ namespace Wox.Core.Plugin.QueryDispatcher { try { - List results = userPlugin.Plugin.Query(query) ?? new List(); - PluginManager.API.PushResults(query,userPlugin.Metadata,results); + List results = regularPlugin.Plugin.Query(query) ?? new List(); + PluginManager.API.PushResults(query,regularPlugin.Metadata,results); } catch (System.Exception e) { - throw new WoxPluginException(userPlugin.Metadata.Name, e); + throw new WoxPluginException(regularPlugin.Metadata.Name, e); } }); } diff --git a/Wox.Core/Plugin/QueryDispatcher/SystemPluginQueryDispatcher.cs b/Wox.Core/Plugin/QueryDispatcher/WildcardPluginQueryDispatcher.cs similarity index 86% rename from Wox.Core/Plugin/QueryDispatcher/SystemPluginQueryDispatcher.cs rename to Wox.Core/Plugin/QueryDispatcher/WildcardPluginQueryDispatcher.cs index e8ef1ee4fe..ae5500b5b5 100644 --- a/Wox.Core/Plugin/QueryDispatcher/SystemPluginQueryDispatcher.cs +++ b/Wox.Core/Plugin/QueryDispatcher/WildcardPluginQueryDispatcher.cs @@ -5,13 +5,12 @@ using Wox.Core.Exception; using Wox.Core.UserSettings; using Wox.Infrastructure.Logger; using Wox.Plugin; -//using Wox.Plugin.SystemPlugins; namespace Wox.Core.Plugin.QueryDispatcher { - public class SystemPluginQueryDispatcher : IQueryDispatcher + public class WildcardPluginQueryDispatcher : IQueryDispatcher { - private IEnumerable allSytemPlugins = PluginManager.AllPlugins.Where(o => PluginManager.IsSystemPlugin(o.Metadata)); + private IEnumerable allSytemPlugins = PluginManager.AllPlugins.Where(o => PluginManager.IsWildcardPlugin(o.Metadata)); public void Dispatch(Query query) {