Split name matching and desciption matching due to fuzzy change

Author: taooceros

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

@@ -206,12 +206,12 @@ private static IEnumerable<Package> CurrentUserPackages()
                     }
                     catch (Exception e)
                     {
-                        ProgramLogger.LogException("UWP" ,"CurrentUserPackages", $"id","An unexpected error occured and "
+                        ProgramLogger.LogException("UWP", "CurrentUserPackages", $"id", "An unexpected error occured and "
                                                    + $"unable to verify if package is valid", e);
                         return false;
                     }
-                    
-                    
+
+
                     return valid;
                 });
                 return ps;
@@ -263,24 +263,42 @@ public class Application : IProgram
             public string LogoPath { get; set; }
             public UWP Package { get; set; }
 
-            public Application(){}
+            public Application() { }
 
 
             public Result Result(string query, IPublicAPI api)
             {
-                var title = (Name, Description) switch
-                {
-                    (var n, null) => n,
-                    (var n, var d) when d.StartsWith(n) => d,
-                    (var n, var d) when n.StartsWith(d) => n,
-                    (var n, var d) when !string.IsNullOrEmpty(d) => $"{n}: {d}",
-                    _ => Name
-                };
+                string title;
+                MatchResult matchResult;
 
-                var matchResult = StringMatcher.FuzzySearch(query, title);
+                // We suppose Name won't be null
+                if (Description == null || Name.StartsWith(Description))
+                {
+                    title = Name;
+                    matchResult = StringMatcher.FuzzySearch(query, title);
+                }
+                else if (Description.StartsWith(Name))
+                {
+                    title = Description;
+                    matchResult = StringMatcher.FuzzySearch(query, Description);
+                }
+                else
+                {
+                    title = $"{Name}: {Description}";
+                    var nameMatch = StringMatcher.FuzzySearch(query, Name);
+                    var desciptionMatch = StringMatcher.FuzzySearch(query, Description);
+                    if (desciptionMatch.Score > nameMatch.Score)
+                    {
+                        for (int i = 0; i < desciptionMatch.MatchData.Count; i++)
+                        {
+                            desciptionMatch.MatchData[i] += Name.Length + 2; // 2 is ": "
+                        }
+                        matchResult = desciptionMatch;
+                    }
+                    else matchResult = nameMatch;
+                }
 
-                if (!matchResult.Success)
-                    return null;
+                if (!matchResult.Success) return null;
 
                 var result = new Result
                 {
@@ -311,7 +329,7 @@ public List<Result> ContextMenus(IPublicAPI api)
 
                         Action = _ =>
                         {
-                            Main.StartProcess(Process.Start, 
+                            Main.StartProcess(Process.Start,
                                                 new ProcessStartInfo(
                                                     !string.IsNullOrEmpty(Main._settings.CustomizedExplorer)
                                                     ? Main._settings.CustomizedExplorer
@@ -403,14 +421,14 @@ internal string ResourceFromPri(string packageFullName, string packageName, stri
             public string FormattedPriReferenceValue(string packageName, string rawPriReferenceValue)
             {
                 const string prefix = "ms-resource:";
-                
+
                 if (string.IsNullOrWhiteSpace(rawPriReferenceValue) || !rawPriReferenceValue.StartsWith(prefix))
                     return rawPriReferenceValue;
 
                 string key = rawPriReferenceValue.Substring(prefix.Length);
                 if (key.StartsWith("//"))
                     return $"{prefix}{key}";
-                
+
                 if (!key.StartsWith("/"))
                 {
                     key = $"/{key}";

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

@@ -12,6 +12,7 @@
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin.Program.Logger;
 using Flow.Launcher.Plugin.SharedCommands;
+using Flow.Launcher.Plugin.SharedModels;
 
 namespace Flow.Launcher.Plugin.Program.Programs
 {
@@ -36,19 +37,38 @@ public class Win32 : IProgram
 
         public Result Result(string query, IPublicAPI api)
         {
-            var title = (Name, Description) switch
+            string title;
+            MatchResult matchResult;
+
+            // We suppose Name won't be null
+            if (Description == null || Name.StartsWith(Description))
             {
-                (var n, null) => n,
-                (var n, var d) when d.StartsWith(n) => d,
-                (var n, var d) when n.StartsWith(d) => n,
-                (var n, var d) when !string.IsNullOrEmpty(d) => $"{n}: {d}",
-                _ => Name
-            };
+                title = Name;
+                matchResult = StringMatcher.FuzzySearch(query, title);
+            }
+            else if (Description.StartsWith(Name))
+            {
+                title = Description;
+                matchResult = StringMatcher.FuzzySearch(query, Description);
+            }
+            else
+            {
+                title = $"{Name}: {Description}";
+                var nameMatch = StringMatcher.FuzzySearch(query, Name);
+                var desciptionMatch = StringMatcher.FuzzySearch(query, Description);
+                if (desciptionMatch.Score > nameMatch.Score)
+                {
+                    for (int i = 0; i < desciptionMatch.MatchData.Count; i++)
+                    {
+                        desciptionMatch.MatchData[i] += Name.Length + 2; // 2 is ": "
+                    }
+                    matchResult = desciptionMatch;
+                }
+                else matchResult = nameMatch;
+            }
 
-            var matchResult = StringMatcher.FuzzySearch(query, title);
+            if (!matchResult.Success) return null;
 
-            if (!matchResult.Success)
-                return null;
 
             var result = new Result
             {
@@ -58,7 +78,7 @@ public Result Result(string query, IPublicAPI api)
                 Score = matchResult.Score,
                 TitleHighlightData = matchResult.MatchData,
                 ContextData = this,
-                Action = e =>
+                Action = _ =>
                 {
                     var info = new ProcessStartInfo
                     {
@@ -268,10 +288,10 @@ private static IEnumerable<string> ProgramPaths(string directory, string[] suffi
             try
             {
                 var paths = Directory.EnumerateFiles(directory, "*", new EnumerationOptions
-                                                        {
-                                                            IgnoreInaccessible = true,
-                                                            RecurseSubdirectories = true
-                                                        })
+                {
+                    IgnoreInaccessible = true,
+                    RecurseSubdirectories = true
+                })
                                      .Where(x => suffixes.Contains(Extension(x)));
 
                 return paths;