Merge branch 'dev' into add_dedicated_programplugin_logger

jjw24 · jjw24 · commit 140e2a026e29 · 2019-10-27T12:23:16.000+11:00
diff --git a/Plugins/HelloWorldCSharp/plugin.json b/Plugins/HelloWorldCSharp/plugin.json
@@ -8,5 +8,6 @@
     "Language":"csharp",
     "Website":"https://github.com/Wox-launcher/Wox",
     "ExecuteFileName":"HelloWorldCSharp.dll",
-    "IcoPath":"app.png"
+    "IcoPath":"app.png",
+    "Disabled": true
 }
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Commands/Bookmarks.cs b/Plugins/Wox.Plugin.BrowserBookmark/Commands/Bookmarks.cs
@@ -8,9 +8,9 @@ internal static class Bookmarks
     {
         internal static bool MatchProgram(Bookmark bookmark, string queryString)
         {
-            if (StringMatcher.FuzzySearch(queryString, bookmark.Name, new MatchOption()).IsSearchPrecisionScoreMet()) return true;
-            if (StringMatcher.FuzzySearch(queryString, bookmark.PinyinName, new MatchOption()).IsSearchPrecisionScoreMet()) return true;
-            if (StringMatcher.FuzzySearch(queryString, bookmark.Url, new MatchOption()).IsSearchPrecisionScoreMet()) return true;
+            if (StringMatcher.FuzzySearch(queryString, bookmark.Name).IsSearchPrecisionScoreMet()) return true;
+            if (StringMatcher.FuzzySearch(queryString, bookmark.PinyinName).IsSearchPrecisionScoreMet()) return true;
+            if (StringMatcher.FuzzySearch(queryString, bookmark.Url).IsSearchPrecisionScoreMet()) return true;
 
             return false;
         }
diff --git a/Plugins/Wox.Plugin.Everything/plugin.json b/Plugins/Wox.Plugin.Everything/plugin.json
@@ -8,5 +8,6 @@
     "Language":"csharp",
     "Website":"http://www.wox.one",
     "IcoPath":"Images\\find.png",
-    "ExecuteFileName":"Wox.Plugin.Everything.dll"
+    "ExecuteFileName":"Wox.Plugin.Everything.dll",
+    "Disabled": true
 }
diff --git a/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml.cs b/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml.cs
@@ -30,6 +30,8 @@ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
             _settings.ProgramSuffixes = tbSuffixes.Text.Split(Settings.SuffixSeperator);
             string msg = context.API.GetTranslation("wox_plugin_program_update_file_suffixes");
             MessageBox.Show(msg);
+
+            DialogResult = true;
         }
     }
 }
diff --git a/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Wox.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -102,8 +102,11 @@ private void btnReindex_Click(object sender, RoutedEventArgs e)
 
         private void BtnProgramSuffixes_OnClick(object sender, RoutedEventArgs e)
         {
-            ProgramSuffixes p = new ProgramSuffixes(context, _settings);
-            p.ShowDialog();
+            var p = new ProgramSuffixes(context, _settings);
+            if (p.ShowDialog() ?? false)
+            {
+                ReIndexing();
+            }
         }
 
         private void programSourceView_DragEnter(object sender, DragEventArgs e)
diff --git a/Wox.Core/Plugin/PluginManager.cs b/Wox.Core/Plugin/PluginManager.cs
@@ -135,7 +135,7 @@ public static Query QueryInit(string text) //todo is that possible to move it in
             var rawQuery = string.Join(Query.TermSeperater, terms);
             var actionKeyword = string.Empty;
             var search = rawQuery;
-            List<string> actionParameters = terms.ToList();
+            var actionParameters = terms.ToList();
             if (terms.Length == 0) return null;
             if (NonGlobalPlugins.ContainsKey(terms[0]) &&
                 !Settings.Plugins[NonGlobalPlugins[terms[0]].Metadata.ID].Disabled)
diff --git a/Wox.Infrastructure/FuzzyMatcher.cs b/Wox.Infrastructure/FuzzyMatcher.cs
@@ -16,7 +16,7 @@ private FuzzyMatcher(string query, MatchOption opt)
 
         public static FuzzyMatcher Create(string query)
         {
-            return new FuzzyMatcher(query, new MatchOption());
+            return new FuzzyMatcher(query, StringMatcher.DefaultMatchOption);
         }
 
         public static FuzzyMatcher Create(string query, MatchOption opt)
diff --git a/Wox.Infrastructure/StringMatcher.cs b/Wox.Infrastructure/StringMatcher.cs
@@ -8,14 +8,16 @@ namespace Wox.Infrastructure
 {
     public static class StringMatcher
     {
+        public static MatchOption DefaultMatchOption = new MatchOption();
+
         public static string UserSettingSearchPrecision { get; set; }
 
         [Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]
         public static int Score(string source, string target)
         {
             if (!string.IsNullOrEmpty(source) && !string.IsNullOrEmpty(target))
             {
-                return FuzzySearch(target, source, new MatchOption()).Score;
+                return FuzzySearch(target, source, DefaultMatchOption).Score;
             }
             else
             {
@@ -26,12 +28,12 @@ public static int Score(string source, string target)
         [Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]
         public static bool IsMatch(string source, string target)
         {
-            return FuzzySearch(target, source, new MatchOption()).Score > 0;
+            return FuzzySearch(target, source, DefaultMatchOption).Score > 0;
         }
 
         public static MatchResult FuzzySearch(string query, string stringToCompare)
         {
-            return FuzzySearch(query, stringToCompare, new MatchOption());
+            return FuzzySearch(query, stringToCompare, DefaultMatchOption);
         }
 
         /// <summary>
@@ -41,7 +43,7 @@ public static MatchResult FuzzySearch(string query, string stringToCompare, Matc
         {
             if (string.IsNullOrEmpty(stringToCompare) || string.IsNullOrEmpty(query)) return new MatchResult { Success = false };
 
-            query.Trim();
+            query = query.Trim();
 
             var len = stringToCompare.Length;
             var compareString = opt.IgnoreCase ? stringToCompare.ToLower() : stringToCompare;
@@ -98,9 +100,9 @@ private static int CalScore(string query, string stringToCompare, int firstIndex
             var score = 100 * (query.Length + 1) / ((1 + firstIndex) + (matchLen + 1));
             //a match with less characters assigning more weights
             if (stringToCompare.Length - query.Length < 5)
-                score = score + 20;
+                score += 20;
             else if (stringToCompare.Length - query.Length < 10)
-                score = score + 10;
+                score += 10;
 
             return score;
         }
@@ -139,10 +141,10 @@ public static int ScoreForPinyin(string source, string target)
                 {
                     var combination = Alphabet.PinyinComination(source);                    
                     var pinyinScore = combination
-                        .Select(pinyin => FuzzySearch(target, string.Join("", pinyin), new MatchOption()).Score)
+                        .Select(pinyin => FuzzySearch(target, string.Join("", pinyin)).Score)
                         .Max();
                     var acronymScore = combination.Select(Alphabet.Acronym)                        
-                        .Select(pinyin => FuzzySearch(target, pinyin, new MatchOption()).Score)
+                        .Select(pinyin => FuzzySearch(target, pinyin).Score)
                         .Max();
                     var score = Math.Max(pinyinScore, acronymScore);
                     return score;
@@ -163,8 +165,9 @@ public class MatchResult
     {
         public bool Success { get; set; }
         public int Score { get; set; }
+        
         /// <summary>
-        /// hightlight string
+        /// highlight string
         /// </summary>
         public string Value { get; set; }
     }
diff --git a/Wox.Infrastructure/UserSettings/PluginSettings.cs b/Wox.Infrastructure/UserSettings/PluginSettings.cs
@@ -29,7 +29,7 @@ public void UpdatePluginSettings(List<PluginMetadata> metadatas)
                         ID = metadata.ID,
                         Name = metadata.Name,
                         ActionKeywords = metadata.ActionKeywords,
-                        Disabled = false
+                        Disabled = metadata.Disabled
                     };
                 }
             }
diff --git a/Wox.Infrastructure/UserSettings/Settings.cs b/Wox.Infrastructure/UserSettings/Settings.cs
@@ -66,7 +66,7 @@ public bool HideNotifyIcon
             }
         }
         public bool LeaveCmdOpen { get; set; }
-        public bool HideWhenDeactive { get; set; }
+        public bool HideWhenDeactive { get; set; } = true;
         public bool RememberLastLaunchLocation { get; set; }
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
diff --git a/Wox.Plugin/Query.cs b/Wox.Plugin/Query.cs
@@ -6,6 +6,19 @@ namespace Wox.Plugin
 {
     public class Query
     {
+        internal Query() { }
+
+        /// <summary>
+        /// to allow unit tests for plug ins
+        /// </summary>
+        public Query(string rawQuery, string search, string[] terms, string actionKeyword = "")
+        {
+            Search = search;
+            RawQuery = rawQuery;
+            Terms = terms;
+            ActionKeyword = actionKeyword;
+        }
+
         /// <summary>
         /// Raw query, this includes action keyword if it has
         /// We didn't recommend use this property directly. You should always use Search property.
diff --git a/Wox.Plugin/Result.cs b/Wox.Plugin/Result.cs
@@ -110,6 +110,6 @@ public Result() { }
         /// <summary>
         /// Plugin ID that generate this result
         /// </summary>
-        public string PluginID { get; set; }
+        public string PluginID { get; internal set; }
     }
 }
diff --git a/Wox.Test/FuzzyMatcherTest.cs b/Wox.Test/FuzzyMatcherTest.cs
@@ -55,7 +55,7 @@ public void MatchTest()
                 results.Add(new Result
                 {
                     Title = str,
-                    Score = StringMatcher.FuzzySearch("inst", str, new MatchOption()).Score
+                    Score = StringMatcher.FuzzySearch("inst", str).Score
                 });
             }
 
@@ -72,7 +72,7 @@ public void WhenGivenNotAllCharactersFoundInSearchStringThenShouldReturnZeroScor
         {
             var compareString = "Can have rum only in my glass";
 
-            var scoreResult = StringMatcher.FuzzySearch(searchString, compareString, new MatchOption()).Score;
+            var scoreResult = StringMatcher.FuzzySearch(searchString, compareString).Score;
 
             Assert.True(scoreResult == 0);
         }
@@ -92,7 +92,7 @@ public void WhenGivenStringsAndAppliedPrecisionFilteringThenShouldReturnGreaterT
                 results.Add(new Result
                 {
                     Title = str,
-                    Score = StringMatcher.FuzzySearch(searchTerm, str, new MatchOption()).Score
+                    Score = StringMatcher.FuzzySearch(searchTerm, str).Score
                 });
             }            
 
@@ -135,7 +135,7 @@ public void WhenGivenStringsForCalScoreMethodThenShouldReturnCurrentScoring(stri
                 results.Add(new Result
                 {
                     Title = str,
-                    Score = StringMatcher.FuzzySearch(searchTerm, str, new MatchOption()).Score
+                    Score = StringMatcher.FuzzySearch(searchTerm, str).Score
                 });
             }
 
@@ -173,7 +173,7 @@ public void WhenGivenDesiredPrecisionThenShouldReturnAllResultsGreaterOrEqual(st
         {
             var expectedPrecisionString = (StringMatcher.SearchPrecisionScore)expectedPrecisionScore;            
             StringMatcher.UserSettingSearchPrecision = expectedPrecisionString.ToString();
-            var matchResult = StringMatcher.FuzzySearch(queryString, compareString, new MatchOption());
+            var matchResult = StringMatcher.FuzzySearch(queryString, compareString);
 
             Debug.WriteLine("");
             Debug.WriteLine("###############################################");
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
@@ -96,7 +96,7 @@ private void InitializeKeyCommands()
         {
             EscCommand = new RelayCommand(_ =>
             {
-                if (!ResultsSelected())
+                if (!SelectedIsFromQueryResults())
                 {
                     SelectedResults = Results;
                 }
@@ -153,17 +153,21 @@ private void InitializeKeyCommands()
                         MainWindowVisibility = Visibility.Collapsed;
                     }
 
-                    if (ResultsSelected())
+                    if (SelectedIsFromQueryResults())
                     {
                         _userSelectedRecord.Add(result);
                         _history.Add(result.OriginQuery.RawQuery);
                     }
+                    else
+                    {
+                        SelectedResults = Results;
+                    }
                 }
             });
 
             LoadContextMenuCommand = new RelayCommand(_ =>
             {
-                if (ResultsSelected())
+                if (SelectedIsFromQueryResults())
                 {
                     SelectedResults = ContextMenu;
                 }
@@ -175,7 +179,7 @@ private void InitializeKeyCommands()
 
             LoadHistoryCommand = new RelayCommand(_ =>
             {
-                if (ResultsSelected())
+                if (SelectedIsFromQueryResults())
                 {
                     SelectedResults = History;
                     History.SelectedIndex = _history.Items.Count - 1;
@@ -226,7 +230,7 @@ private ResultsViewModel SelectedResults
             set
             {
                 _selectedResults = value;
-                if (ResultsSelected())
+                if (SelectedIsFromQueryResults())
                 {
                     ContextMenu.Visbility = Visibility.Collapsed;
                     History.Visbility = Visibility.Collapsed;
@@ -273,7 +277,7 @@ private ResultsViewModel SelectedResults
 
         public void Query()
         {
-            if (ResultsSelected())
+            if (SelectedIsFromQueryResults())
             {
                 QueryResults();
             }
@@ -487,7 +491,7 @@ private Result ContextMenuPluginInfo(string id)
             return menu;
         }
 
-        private bool ResultsSelected()
+        private bool SelectedIsFromQueryResults()
         {
             var selected = SelectedResults == Results;
             return selected;

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`"Language":"csharp",`
`9`	`9`	`"Website":"https://github.com/Wox-launcher/Wox",`
`10`	`10`	`"ExecuteFileName":"HelloWorldCSharp.dll",`
`11`		`- "IcoPath":"app.png"`
	`11`	`+ "IcoPath":"app.png",`
	`12`	`+ "Disabled": true`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ internal static class Bookmarks`
`8`	`8`	`{`
`9`	`9`	`internal static bool MatchProgram(Bookmark bookmark, string queryString)`
`10`	`10`	`{`
`11`		`- if (StringMatcher.FuzzySearch(queryString, bookmark.Name, new MatchOption()).IsSearchPrecisionScoreMet()) return true;`
`12`		`- if (StringMatcher.FuzzySearch(queryString, bookmark.PinyinName, new MatchOption()).IsSearchPrecisionScoreMet()) return true;`
`13`		`- if (StringMatcher.FuzzySearch(queryString, bookmark.Url, new MatchOption()).IsSearchPrecisionScoreMet()) return true;`
	`11`	`+ if (StringMatcher.FuzzySearch(queryString, bookmark.Name).IsSearchPrecisionScoreMet()) return true;`
	`12`	`+ if (StringMatcher.FuzzySearch(queryString, bookmark.PinyinName).IsSearchPrecisionScoreMet()) return true;`
	`13`	`+ if (StringMatcher.FuzzySearch(queryString, bookmark.Url).IsSearchPrecisionScoreMet()) return true;`
`14`	`14`
`15`	`15`	`return false;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`"Language":"csharp",`
`9`	`9`	`"Website":"http://www.wox.one",`
`10`	`10`	`"IcoPath":"Images\\find.png",`
`11`		`- "ExecuteFileName":"Wox.Plugin.Everything.dll"`
	`11`	`+ "ExecuteFileName":"Wox.Plugin.Everything.dll",`
	`12`	`+ "Disabled": true`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)`
`30`	`30`	`_settings.ProgramSuffixes = tbSuffixes.Text.Split(Settings.SuffixSeperator);`
`31`	`31`	`string msg = context.API.GetTranslation("wox_plugin_program_update_file_suffixes");`
`32`	`32`	`MessageBox.Show(msg);`
	`33`	`+`
	`34`	`+ DialogResult = true;`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,11 @@ private void btnReindex_Click(object sender, RoutedEventArgs e)`
`102`	`102`
`103`	`103`	`private void BtnProgramSuffixes_OnClick(object sender, RoutedEventArgs e)`
`104`	`104`	`{`
`105`		`- ProgramSuffixes p = new ProgramSuffixes(context, _settings);`
`106`		`- p.ShowDialog();`
	`105`	`+ var p = new ProgramSuffixes(context, _settings);`
	`106`	`+ if (p.ShowDialog() ?? false)`
	`107`	`+ {`
	`108`	`+ ReIndexing();`
	`109`	`+ }`
`107`	`110`	`}`
`108`	`111`
`109`	`112`	`private void programSourceView_DragEnter(object sender, DragEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ private FuzzyMatcher(string query, MatchOption opt)`
`16`	`16`
`17`	`17`	`public static FuzzyMatcher Create(string query)`
`18`	`18`	`{`
`19`		`- return new FuzzyMatcher(query, new MatchOption());`
	`19`	`+ return new FuzzyMatcher(query, StringMatcher.DefaultMatchOption);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static FuzzyMatcher Create(string query, MatchOption opt)`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,16 @@ namespace Wox.Infrastructure`
`8`	`8`	`{`
`9`	`9`	`public static class StringMatcher`
`10`	`10`	`{`
	`11`	`+ public static MatchOption DefaultMatchOption = new MatchOption();`
	`12`	`+`
`11`	`13`	`public static string UserSettingSearchPrecision { get; set; }`
`12`	`14`
`13`	`15`	`[Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]`
`14`	`16`	`public static int Score(string source, string target)`
`15`	`17`	`{`
`16`	`18`	`if (!string.IsNullOrEmpty(source) && !string.IsNullOrEmpty(target))`
`17`	`19`	`{`
`18`		`- return FuzzySearch(target, source, new MatchOption()).Score;`
	`20`	`+ return FuzzySearch(target, source, DefaultMatchOption).Score;`
`19`	`21`	`}`
`20`	`22`	`else`
`21`	`23`	`{`
`@@ -26,12 +28,12 @@ public static int Score(string source, string target)`
`26`	`28`	`[Obsolete("This method is obsolete and should not be used. Please use the static function StringMatcher.FuzzySearch")]`
`27`	`29`	`public static bool IsMatch(string source, string target)`
`28`	`30`	`{`
`29`		`- return FuzzySearch(target, source, new MatchOption()).Score > 0;`
	`31`	`+ return FuzzySearch(target, source, DefaultMatchOption).Score > 0;`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public static MatchResult FuzzySearch(string query, string stringToCompare)`
`33`	`35`	`{`
`34`		`- return FuzzySearch(query, stringToCompare, new MatchOption());`
	`36`	`+ return FuzzySearch(query, stringToCompare, DefaultMatchOption);`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`/// <summary>`
`@@ -41,7 +43,7 @@ public static MatchResult FuzzySearch(string query, string stringToCompare, Matc`
`41`	`43`	`{`
`42`	`44`	`if (string.IsNullOrEmpty(stringToCompare) \|\| string.IsNullOrEmpty(query)) return new MatchResult { Success = false };`
`43`	`45`
`44`		`- query.Trim();`
	`46`	`+ query = query.Trim();`
`45`	`47`
`46`	`48`	`var len = stringToCompare.Length;`
`47`	`49`	`var compareString = opt.IgnoreCase ? stringToCompare.ToLower() : stringToCompare;`
`@@ -98,9 +100,9 @@ private static int CalScore(string query, string stringToCompare, int firstIndex`
`98`	`100`	`var score = 100 * (query.Length + 1) / ((1 + firstIndex) + (matchLen + 1));`
`99`	`101`	`//a match with less characters assigning more weights`
`100`	`102`	`if (stringToCompare.Length - query.Length < 5)`
`101`		`- score = score + 20;`
	`103`	`+ score += 20;`
`102`	`104`	`else if (stringToCompare.Length - query.Length < 10)`
`103`		`- score = score + 10;`
	`105`	`+ score += 10;`
`104`	`106`
`105`	`107`	`return score;`
`106`	`108`	`}`
`@@ -139,10 +141,10 @@ public static int ScoreForPinyin(string source, string target)`
`139`	`141`	`{`
`140`	`142`	`var combination = Alphabet.PinyinComination(source);`
`141`	`143`	`var pinyinScore = combination`
`142`		`- .Select(pinyin => FuzzySearch(target, string.Join("", pinyin), new MatchOption()).Score)`
	`144`	`+ .Select(pinyin => FuzzySearch(target, string.Join("", pinyin)).Score)`
`143`	`145`	`.Max();`
`144`	`146`	`var acronymScore = combination.Select(Alphabet.Acronym)`
`145`		`- .Select(pinyin => FuzzySearch(target, pinyin, new MatchOption()).Score)`
	`147`	`+ .Select(pinyin => FuzzySearch(target, pinyin).Score)`
`146`	`148`	`.Max();`
`147`	`149`	`var score = Math.Max(pinyinScore, acronymScore);`
`148`	`150`	`return score;`
`@@ -163,8 +165,9 @@ public class MatchResult`
`163`	`165`	`{`
`164`	`166`	`public bool Success { get; set; }`
`165`	`167`	`public int Score { get; set; }`
	`168`	`+`
`166`	`169`	`/// <summary>`
`167`		`- /// hightlight string`
	`170`	`+ /// highlight string`
`168`	`171`	`/// </summary>`
`169`	`172`	`public string Value { get; set; }`
`170`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void UpdatePluginSettings(List<PluginMetadata> metadatas)`
`29`	`29`	`ID = metadata.ID,`
`30`	`30`	`Name = metadata.Name,`
`31`	`31`	`ActionKeywords = metadata.ActionKeywords,`
`32`		`- Disabled = false`
	`32`	`+ Disabled = metadata.Disabled`
`33`	`33`	`};`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public bool HideNotifyIcon`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`public bool LeaveCmdOpen { get; set; }`
`69`		`- public bool HideWhenDeactive { get; set; }`
	`69`	`+ public bool HideWhenDeactive { get; set; } = true;`
`70`	`70`	`public bool RememberLastLaunchLocation { get; set; }`
`71`	`71`	`public bool IgnoreHotkeysOnFullscreen { get; set; }`
`72`	`72`