some API changes for Query class and renames.

OldNero · Jan 26, 2015 · 7821f41 · 7821f41
1 parent ddf6154
commit 7821f41
Show file tree

Hide file tree

Showing 29 changed files with 371 additions and 289 deletions.
diff --git a/Plugins/Wox.Plugin.CMD/CMD.cs b/Plugins/Wox.Plugin.CMD/CMD.cs
@@ -21,14 +21,14 @@ public List<Result> Query(Query query)
         {
             List<Result> results = new List<Result>();
             List<Result> pushedResults = new List<Result>();
-            if (query.RawQuery == ">")
+            if (query.Search == ">")
             {
                 return GetAllHistoryCmds();
             }
 
-            if (query.RawQuery.StartsWith(">") && query.RawQuery.Length > 1)
+            if (query.Search.StartsWith(">") && query.Search.Length > 1)
             {
-                string cmd = query.RawQuery.Substring(1);
+                string cmd = query.Search.Substring(1);
                 var queryCmd = GetCurrentCmd(cmd);
                 context.API.PushResults(query, context.CurrentPluginMetadata, new List<Result>() { queryCmd });
                 pushedResults.Add(queryCmd);

diff --git a/Plugins/Wox.Plugin.Caculator/Calculator.cs b/Plugins/Wox.Plugin.Caculator/Calculator.cs
@@ -28,13 +28,13 @@ static Calculator()
 
         public List<Result> Query(Query query)
         {
-            if (query.RawQuery.Length <= 2          // don't affect when user only input "e" or "i" keyword
-                || !regValidExpressChar.IsMatch(query.RawQuery) 
-                || !IsBracketComplete(query.RawQuery)) return new List<Result>();
+            if (query.Search.Length <= 2          // don't affect when user only input "e" or "i" keyword
+                || !regValidExpressChar.IsMatch(query.Search)
+                || !IsBracketComplete(query.Search)) return new List<Result>();
 
             try
             {
-                var result = yampContext.Run(query.RawQuery);
+                var result = yampContext.Run(query.Search);
                 if (result.Output != null && !string.IsNullOrEmpty(result.Result))
                 {
                     return new List<Result>() { new Result() { 

diff --git a/Plugins/Wox.Plugin.Color/Color.cs b/Plugins/Wox.Plugin.Color/Color.cs
@@ -29,7 +29,7 @@ public ColorsPlugin()
 
         public List<Result> Query(Query query)
         {
-            var raw = query.RawQuery;
+            var raw = query.Search;
             if (!IsAvailable(raw)) return new List<Result>(0);
             try
             {

diff --git a/Plugins/Wox.Plugin.ControlPanel/ControlPanel.cs b/Plugins/Wox.Plugin.ControlPanel/ControlPanel.cs
@@ -38,9 +38,7 @@ public  void Init(PluginInitContext context)
 
         public List<Result> Query(Query query)
         {
-            if (query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List<Result>();
-            string myQuery = query.RawQuery.Trim();
-
+            string myQuery = query.Search.Trim();
             List<Result> results = new List<Result>();
 
             foreach (var item in controlPanelItems)

diff --git a/Plugins/Wox.Plugin.Folder/FolderPlugin.cs b/Plugins/Wox.Plugin.Folder/FolderPlugin.cs
@@ -53,8 +53,7 @@ private void ApiBackKeyDownEvent(WoxKeyDownEventArgs e)
 
         public List<Result> Query(Query query)
         {
-            if(string.IsNullOrEmpty(query.RawQuery)) return new List<Result>();
-            string input = query.RawQuery.ToLower();
+            string input = query.Search.ToLower();
 
             List<FolderLink> userFolderLinks = FolderStorage.Instance.FolderLinks.Where(
                 x => x.Nickname.StartsWith(input, StringComparison.OrdinalIgnoreCase)).ToList();

diff --git a/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs b/Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs
@@ -13,16 +13,14 @@ public class PluginIndicator : IPlugin
         public List<Result> Query(Query query)
         {
             List<Result> results = new List<Result>();
-            if (string.IsNullOrEmpty(query.RawQuery)) return results;
-
             if (allPlugins.Count == 0)
             {
-                allPlugins = context.API.GetAllPlugins().Where(o => !PluginManager.IsWildcardPlugin(o.Metadata)).ToList();
+                allPlugins = context.API.GetAllPlugins().Where(o => !PluginManager.IsSystemPlugin(o.Metadata)).ToList();
             }
 
             foreach (PluginMetadata metadata in allPlugins.Select(o => o.Metadata))
             {
-                if (metadata.ActionKeyword.StartsWith(query.RawQuery))
+                if (metadata.ActionKeyword.StartsWith(query.Search))
                 {
                     PluginMetadata metadataCopy = metadata;
                     var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == metadataCopy.ID);
@@ -47,7 +45,7 @@ public List<Result> Query(Query query)
                 }
             }
 
-            results.AddRange(UserSettingStorage.Instance.WebSearches.Where(o => o.ActionWord.StartsWith(query.RawQuery) && o.Enabled).Select(n => new Result()
+            results.AddRange(UserSettingStorage.Instance.WebSearches.Where(o => o.ActionWord.StartsWith(query.Search) && o.Enabled).Select(n => new Result()
             {
                 Title = n.ActionWord,
                 SubTitle = string.Format("Activate {0} web search", n.ActionWord),