Merge pull request #410 from Flow-Launcher/remove_redudant_nickname

Remove redundant QuickAccess folder nickname path

Author: jjw24

Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/AccessLink.cs

@@ -11,7 +11,7 @@ public class AccessLink
         public ResultType Type { get; set; } = ResultType.Folder;
 
         [JsonIgnore]
-        public string Nickname
+        public string Name
         {
             get
             {
@@ -21,8 +21,7 @@ public string Nickname
                     return path[0..^1] + " Drive";
 
                 return path.Split(new[] { System.IO.Path.DirectorySeparatorChar }, StringSplitOptions.None)
-                            .Last()
-                            + " (" + System.IO.Path.GetDirectoryName(Path) + ")";
+                           .Last();
             }
         }
     }

Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs

@@ -6,6 +6,8 @@ namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks
 {
     internal static class QuickAccess
     {
+        private const int quickAccessResultScore = 100;
+
         internal static List<Result> AccessLinkListMatched(Query query, List<AccessLink> accessLinks)
         {
             if (string.IsNullOrEmpty(query.Search))
@@ -15,29 +17,27 @@ internal static List<Result> AccessLinkListMatched(Query query, List<AccessLink>
 
             var queriedAccessLinks =
                 accessLinks
-                .Where(x => x.Nickname.Contains(search, StringComparison.OrdinalIgnoreCase))
+                .Where(x => x.Name.Contains(search, StringComparison.OrdinalIgnoreCase))
                 .OrderBy(x => x.Type)
-                .ThenBy(x => x.Nickname);
+                .ThenBy(x => x.Name);
 
             return queriedAccessLinks.Select(l => l.Type switch
             {
-                ResultType.Folder => ResultManager.CreateFolderResult(l.Nickname, l.Path, l.Path, query, 100),
-                ResultType.File => ResultManager.CreateFileResult(l.Path, query, 100),
+                ResultType.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query, quickAccessResultScore),
+                ResultType.File => ResultManager.CreateFileResult(l.Path, query, quickAccessResultScore),
                 _ => throw new ArgumentOutOfRangeException()
-
             }).ToList();
         }
 
         internal static List<Result> AccessLinkListAll(Query query, List<AccessLink> accessLinks)
             => accessLinks
                 .OrderBy(x => x.Type)
-                .ThenBy(x => x.Nickname)
+                .ThenBy(x => x.Name)
                 .Select(l => l.Type switch
                 {
-                    ResultType.Folder => ResultManager.CreateFolderResult(l.Nickname, l.Path, l.Path, query),
-                    ResultType.File => ResultManager.CreateFileResult(l.Path, query, 100),
+                    ResultType.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query),
+                    ResultType.File => ResultManager.CreateFileResult(l.Path, query, quickAccessResultScore),
                     _ => throw new ArgumentOutOfRangeException()
-
                 }).ToList();
     }
 }

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

@@ -7,7 +7,7 @@
   "Name": "Explorer",
   "Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
   "Author": "Jeremy Wu",
-  "Version": "1.7.3",
+  "Version": "1.7.4",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",