From 6fdbc9cdfad0d017067784bfb0d712c8bf7dad0b Mon Sep 17 00:00:00 2001 From: zlsun Date: Mon, 16 Jun 2014 14:08:11 +0800 Subject: [PATCH] Remove unnecessary code. --- Wox.Plugin.SystemPlugins/BrowserBookmarks.cs | 2 +- Wox.Plugin.SystemPlugins/Calculator.cs | 3 +-- Wox.Plugin.SystemPlugins/Program/Programs.cs | 2 +- Wox.Plugin.SystemPlugins/Sys.cs | 2 +- Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs | 1 - Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs | 1 - 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Wox.Plugin.SystemPlugins/BrowserBookmarks.cs b/Wox.Plugin.SystemPlugins/BrowserBookmarks.cs index 4521a6c062..59a201f158 100644 --- a/Wox.Plugin.SystemPlugins/BrowserBookmarks.cs +++ b/Wox.Plugin.SystemPlugins/BrowserBookmarks.cs @@ -19,7 +19,7 @@ namespace Wox.Plugin.SystemPlugins protected override List QueryInternal(Query query) { - if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); + if (query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); var fuzzyMather = FuzzyMatcher.Create(query.RawQuery); List returnList = bookmarks.Where(o => MatchProgram(o, fuzzyMather)).ToList(); diff --git a/Wox.Plugin.SystemPlugins/Calculator.cs b/Wox.Plugin.SystemPlugins/Calculator.cs index 9453851dd5..7968c4b95c 100644 --- a/Wox.Plugin.SystemPlugins/Calculator.cs +++ b/Wox.Plugin.SystemPlugins/Calculator.cs @@ -33,8 +33,7 @@ namespace Wox.Plugin.SystemPlugins protected override List QueryInternal(Query query) { - if (string.IsNullOrEmpty(query.RawQuery) - || query.RawQuery.Length <= 2 // don't affect when user only input "e" or "i" keyword + 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(); diff --git a/Wox.Plugin.SystemPlugins/Program/Programs.cs b/Wox.Plugin.SystemPlugins/Program/Programs.cs index 3d45e5364e..f1906f8c55 100644 --- a/Wox.Plugin.SystemPlugins/Program/Programs.cs +++ b/Wox.Plugin.SystemPlugins/Program/Programs.cs @@ -51,7 +51,7 @@ namespace Wox.Plugin.SystemPlugins.Program protected override List QueryInternal(Query query) { - if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); + if (query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); var fuzzyMather = FuzzyMatcher.Create(query.RawQuery); List returnList = installedList.Where(o => MatchProgram(o, fuzzyMather)).ToList(); diff --git a/Wox.Plugin.SystemPlugins/Sys.cs b/Wox.Plugin.SystemPlugins/Sys.cs index fd85057f2e..c4fdb5561f 100644 --- a/Wox.Plugin.SystemPlugins/Sys.cs +++ b/Wox.Plugin.SystemPlugins/Sys.cs @@ -25,7 +25,7 @@ namespace Wox.Plugin.SystemPlugins protected override List QueryInternal(Query query) { - if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); + if (query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); List results = new List(); diff --git a/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs b/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs index a81cd036d1..d1759b17e1 100644 --- a/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs +++ b/Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs @@ -16,7 +16,6 @@ namespace Wox.Plugin.SystemPlugins protected override List QueryInternal(Query query) { List results = new List(); - if (string.IsNullOrEmpty(query.RawQuery)) return results; foreach (PluginMetadata metadata in allPlugins.Select(o => o.Metadata)) { diff --git a/Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs b/Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs index b4c7830ef7..eeefdc360e 100644 --- a/Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs +++ b/Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs @@ -18,7 +18,6 @@ namespace Wox.Plugin.SystemPlugins protected override List QueryInternal(Query query) { List results = new List(); - if (string.IsNullOrEmpty(query.ActionName)) return results; WebSearch webSearch = UserSettingStorage.Instance.WebSearches.FirstOrDefault(o => o.ActionWord == query.ActionName && o.Enabled);