Merge branch 'dev' into LocalizedLnkName

Author: VictoriousRaptor

.github/actions/spelling/expect.txt

@@ -35,3 +35,26 @@ mscorlib
 pythonw
 dotnet
 winget
+jjw24
+wolframalpha
+gmail
+duckduckgo
+facebook
+findicon
+baidu
+pls
+websearch
+qianlifeng
+userdata
+srchadmin
+EWX
+dlgtext
+CMD
+appref-ms
+appref
+TSource
+runas
+dpi
+popup
+ptr
+pluginindicator

.github/actions/spelling/patterns.txt

@@ -108,3 +108,9 @@
 # Localization keys
 #x:Key="[^"]+"
 #{DynamicResource [^"]+}
+
+# html tag
+<\w+[^>]*>
+
+#http/https
+(?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]

.github/workflows/spelling.yml

@@ -82,10 +82,10 @@ jobs:
         post_comment: 0
         use_magic_file: 1
         experimental_apply_changes_via_bot: 1
-        use_sarif: true # to show in pr page
+        use_sarif: 0 # to show in pr page
         extra_dictionary_limit: 10
         check_commit_messages: commits title description
-        only_check_changed_files: false
+        only_check_changed_files: 1
         check_extra_dictionaries: ''
         quit_without_error: true
         extra_dictionaries:
@@ -96,6 +96,8 @@ jobs:
           cspell:csharp/csharp.txt
           cspell:dotnet/dotnet.txt
           cspell:python/src/python/python-lib.txt
+          cspell:aws/aws.txt
+          cspell:companies/src/companies.txt
         warnings:
           binary-file,deprecated-feature,large-file,limited-references,noisy-file,non-alpha-in-dictionary,unexpected-line-ending,whitespace-in-dictionary,minified-file,unsupported-configuration,unrecognized-spelling,no-newline-at-eof
 

Plugins/Flow.Launcher.Plugin.PluginIndicator/Languages/en.xaml

@@ -2,7 +2,9 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
+    <system:String x:Key="flowlauncher_plugin_pluginindicator_result_subtitle">Activate {0} plugin action keyword</system:String>
+
     <system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_name">Plugin Indicator</system:String>
     <system:String x:Key="flowlauncher_plugin_pluginindicator_plugin_description">Provides plugins action words suggestions</system:String>
-    
-</ResourceDictionary>
+
+</ResourceDictionary>

Plugins/Flow.Launcher.Plugin.PluginIndicator/Main.cs

@@ -10,28 +10,28 @@ public class Main : IPlugin, IPluginI18n
 
         public List<Result> Query(Query query)
         {
-            // if query contains more than one word, eg. github tips 
-            // user has decided to type something else rather than wanting to see the available action keywords
-            if (query.SearchTerms.Length > 1)
-                return new List<Result>();
-
-            var results = from keyword in PluginManager.NonGlobalPlugins.Keys
-                          where keyword.StartsWith(query.Search)
-                          let metadata = PluginManager.NonGlobalPlugins[keyword].Metadata
-                          where !metadata.Disabled
-                          select new Result
-                          {
-                              Title = keyword,
-                              SubTitle = $"Activate {metadata.Name} plugin",
-                              Score = 100,
-                              IcoPath = metadata.IcoPath,
-                              AutoCompleteText = $"{keyword}{Plugin.Query.TermSeparator}",
-                              Action = c =>
-                              {
-                                  context.API.ChangeQuery($"{keyword}{Plugin.Query.TermSeparator}");
-                                  return false;
-                              }
-                          };
+            var results =
+                from keyword in PluginManager.NonGlobalPlugins.Keys
+                let plugin = PluginManager.NonGlobalPlugins[keyword].Metadata
+                let keywordSearchResult = context.API.FuzzySearch(query.Search, keyword)
+                let searchResult = keywordSearchResult.IsSearchPrecisionScoreMet() ? keywordSearchResult : context.API.FuzzySearch(query.Search, plugin.Name)
+                let score = searchResult.Score
+                where (searchResult.IsSearchPrecisionScoreMet()
+                        || string.IsNullOrEmpty(query.Search)) // To list all available action keywords
+                    && !plugin.Disabled
+                select new Result
+                {
+                    Title = keyword,
+                    SubTitle = string.Format(context.API.GetTranslation("flowlauncher_plugin_pluginindicator_result_subtitle"), plugin.Name),
+                    Score = score,
+                    IcoPath = plugin.IcoPath,
+                    AutoCompleteText = $"{keyword}{Plugin.Query.TermSeparator}",
+                    Action = c =>
+                    {
+                        context.API.ChangeQuery($"{keyword}{Plugin.Query.TermSeparator}");
+                        return false;
+                    }
+                };
             return results.ToList();
         }
 

Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json

@@ -2,9 +2,9 @@
   "ID": "6A122269676E40EB86EB543B945932B9",
   "ActionKeyword": "*",
   "Name": "Plugin Indicator",
-  "Description": "Provide plugin actionword suggestion",
+  "Description": "Provides plugin action keyword suggestions",
   "Author": "qianlifeng",
-  "Version": "2.0.0",
+  "Version": "2.0.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.PluginIndicator.dll",

Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml

@@ -55,7 +55,7 @@
     <system:String x:Key="flowlauncher_plugin_program_suffixes_cannot_empty">File suffixes can't be empty</system:String>
     <system:String x:Key="flowlauncher_plugin_protocols_cannot_empty">Protocols can't be empty</system:String>
 
-    <system:String x:Key="flowlauncher_plugin_program_suffixes_excutable_types">File Suffixes</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_suffixes_executable_types">File Suffixes</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_URL_types">URL Protocols</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_URL_steam">Steam Games</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_URL_epic">Epic Games</system:String>

Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml

@@ -162,7 +162,7 @@
                             Margin="0,0,0,8"
                             FontSize="16"
                             FontWeight="SemiBold"
-                            Text="{DynamicResource flowlauncher_plugin_program_suffixes_excutable_types}" />
+                            Text="{DynamicResource flowlauncher_plugin_program_suffixes_executable_types}" />
                         <CheckBox
                             Name="apprefMS"
                             Margin="10,0,0,0"

Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs

@@ -38,15 +38,15 @@ public UWP(Package package)
 
         public void InitAppsInPackage(Package package)
         {
-            var applist = new List<Application>();
+            var apps = new List<Application>();
             // WinRT
             var appListEntries = package.GetAppListEntries();
             foreach (var app in appListEntries)
             {
                 try
                 {
                     var tmp = new Application(app, this);
-                    applist.Add(tmp);
+                    apps.Add(tmp);
                 }
                 catch (Exception e)
                 {
@@ -55,7 +55,7 @@ public void InitAppsInPackage(Package package)
                            + $"{FullName} from location {Location}", e);
                 }
             }
-            Apps = applist.ToArray();
+            Apps = apps.ToArray();
 
             try
             {
@@ -147,7 +147,7 @@ private PackageVersion GetPackageVersionFromManifest(XmlNode xmlRoot)
                 }
 
                 ProgramLogger.LogException($"|UWP|GetPackageVersionFromManifest|{Location}" +
-                       "|Trying to get the package version of the UWP program, but an unknown UWP appmanifest version in package "
+                       "|Trying to get the package version of the UWP program, but an unknown UWP app-manifest version in package "
                        + $"{FullName} from location {Location}", new FormatException());
                 return PackageVersion.Unknown;
             }
@@ -392,14 +392,14 @@ public Result Result(string query, IPublicAPI api)
                 {
                     title = $"{Name}: {Description}";
                     var nameMatch = StringMatcher.FuzzySearch(query, Name);
-                    var desciptionMatch = StringMatcher.FuzzySearch(query, Description);
-                    if (desciptionMatch.Score > nameMatch.Score)
+                    var descriptionMatch = StringMatcher.FuzzySearch(query, Description);
+                    if (descriptionMatch.Score > nameMatch.Score)
                     {
-                        for (int i = 0; i < desciptionMatch.MatchData.Count; i++)
+                        for (int i = 0; i < descriptionMatch.MatchData.Count; i++)
                         {
-                            desciptionMatch.MatchData[i] += Name.Length + 2; // 2 is ": "
+                            descriptionMatch.MatchData[i] += Name.Length + 2; // 2 is ": "
                         }
-                        matchResult = desciptionMatch;
+                        matchResult = descriptionMatch;
                     }
                     else matchResult = nameMatch;
                 }
@@ -633,7 +633,7 @@ string TryToFindLogo(string uri, string path, int px)
             //    }
             //    else
             //    {
-            //        ProgramLogger.LogException($"|UWP|ImageFromPath|{(string.IsNullOrEmpty(path) ? "Not Avaliable" : path)}" +
+            //        ProgramLogger.LogException($"|UWP|ImageFromPath|{(string.IsNullOrEmpty(path) ? "Not Available" : path)}" +
             //                                   $"|Unable to get logo for {UserModelId} from {path} and" +
             //                                   $" located in {Location}", new FileNotFoundException());
             //        return new BitmapImage(new Uri(Constant.MissingImgIcon));
@@ -658,8 +658,8 @@ string TryToFindLogo(string uri, string path, int px)
             //            var brush = new SolidColorBrush(color);
             //            var pen = new Pen(brush, 1);
             //            var backgroundArea = new Rect(0, 0, width, width);
-            //            var rectabgle = new RectangleGeometry(backgroundArea);
-            //            var rectDrawing = new GeometryDrawing(brush, pen, rectabgle);
+            //            var rectangle = new RectangleGeometry(backgroundArea);
+            //            var rectDrawing = new GeometryDrawing(brush, pen, rectangle);
             //            group.Children.Add(rectDrawing);
 
             //            var imageArea = new Rect(x, y, image.Width, image.Height);

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -545,12 +545,12 @@ private static IEnumerable<string> GetPathFromRegistry(RegistryKey root)
                 .Distinct();
         }
 
-        private static string GetProgramPathFromRegistrySubKeys(RegistryKey root, string subkey)
+        private static string GetProgramPathFromRegistrySubKeys(RegistryKey root, string subKey)
         {
             var path = string.Empty;
             try
             {
-                using (var key = root.OpenSubKey(subkey))
+                using (var key = root.OpenSubKey(subKey))
                 {
                     if (key == null)
                         return string.Empty;