From 79461d52c2ba18f70ade65f0c6a8a6cdc895b1ce Mon Sep 17 00:00:00 2001 From: bao-qian Date: Sun, 1 Nov 2015 22:59:56 +0000 Subject: [PATCH] Rearrange code Fields -> Properties -> Init method -> Query methods -> Is methods -> Get Methods --- Wox.Core/Plugin/PluginManager.cs | 76 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/Wox.Core/Plugin/PluginManager.cs b/Wox.Core/Plugin/PluginManager.cs index f5b491f433..4bf0c40550 100644 --- a/Wox.Core/Plugin/PluginManager.cs +++ b/Wox.Core/Plugin/PluginManager.cs @@ -26,8 +26,6 @@ namespace Wox.Core.Plugin private static IEnumerable exclusiveSearchPlugins; private static List> contextMenuPlugins; - public static IPublicAPI API { get; private set; } - private static List plugins = new List(); /// @@ -35,17 +33,27 @@ namespace Wox.Core.Plugin /// private static List pluginDirectories = new List(); - private static void SetupPluginDirectories() + public static List AllPlugins { - pluginDirectories.Add(PluginDirectory); - MakesurePluginDirectoriesExist(); + get + { + return plugins.OrderBy(o => o.Metadata.Name).ToList(); + } } + public static IPublicAPI API { private set; get; } + public static string PluginDirectory { get { return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Plugins"); } } + private static void SetupPluginDirectories() + { + pluginDirectories.Add(PluginDirectory); + MakesurePluginDirectoriesExist(); + } + private static void MakesurePluginDirectoriesExist() { foreach (string pluginDirectory in pluginDirectories) @@ -159,11 +167,33 @@ namespace Wox.Core.Plugin } } - public static List AllPlugins + private static void QueryForPlugin(PluginPair pair, Query query) { - get + try { - return plugins.OrderBy(o => o.Metadata.Name).ToList(); + Stopwatch sw = new Stopwatch(); + sw.Start(); + List results = pair.Plugin.Query(query) ?? new List(); + results.ForEach(o => + { + o.PluginID = pair.Metadata.ID; + }); + sw.Stop(); + Debug.WriteLine(string.Format("Plugin query: {0} - {1}", pair.Metadata.Name, sw.ElapsedMilliseconds)); + pair.QueryCount += 1; + if (pair.QueryCount == 1) + { + pair.AvgQueryTime = sw.ElapsedMilliseconds; + } + else + { + pair.AvgQueryTime = (pair.AvgQueryTime + sw.ElapsedMilliseconds) / 2; + } + API.PushResults(query, pair.Metadata, results); + } + catch (System.Exception e) + { + throw new WoxPluginException(pair.Metadata.Name, e); } } @@ -198,36 +228,6 @@ namespace Wox.Core.Plugin LoadInstantSearches().Any(o => o.Key.Metadata.ID == pluginMetadata.ID); } - private static void QueryForPlugin(PluginPair pair, Query query) - { - try - { - Stopwatch sw = new Stopwatch(); - sw.Start(); - List results = pair.Plugin.Query(query) ?? new List(); - results.ForEach(o => - { - o.PluginID = pair.Metadata.ID; - }); - sw.Stop(); - Debug.WriteLine(string.Format("Plugin query: {0} - {1}", pair.Metadata.Name, sw.ElapsedMilliseconds)); - pair.QueryCount += 1; - if (pair.QueryCount == 1) - { - pair.AvgQueryTime = sw.ElapsedMilliseconds; - } - else - { - pair.AvgQueryTime = (pair.AvgQueryTime + sw.ElapsedMilliseconds) / 2; - } - API.PushResults(query, pair.Metadata, results); - } - catch (System.Exception e) - { - throw new WoxPluginException(pair.Metadata.Name, e); - } - } - private static List> LoadInstantSearches() { if (instantSearches != null) return instantSearches;