From aee5f6617e2f97eac997c468dc6293cbc017b922 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 14 Apr 2021 22:11:40 +1000 Subject: [PATCH 1/3] remove the redundant path in brackets and update Nickname to Name --- .../Search/QuickAccessLinks/AccessLink.cs | 5 ++--- .../Search/QuickAccessLinks/QuickAccess.cs | 12 +++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/AccessLink.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/AccessLink.cs index f623cc2ca17..0e4465b452b 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/AccessLink.cs +++ b/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(); } } } diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs index 2dc09b55b91..268b6a34191 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs @@ -15,29 +15,27 @@ internal static List AccessLinkListMatched(Query query, List 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.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query, 100), ResultType.File => ResultManager.CreateFileResult(l.Path, query, 100), _ => throw new ArgumentOutOfRangeException() - }).ToList(); } internal static List AccessLinkListAll(Query query, List 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.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query), ResultType.File => ResultManager.CreateFileResult(l.Path, query, 100), _ => throw new ArgumentOutOfRangeException() - }).ToList(); } } From ed52b9dfa59c23198c2b49d55407bac420f2e5cf Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 14 Apr 2021 22:12:00 +1000 Subject: [PATCH 2/3] Explorer version bump --- Plugins/Flow.Launcher.Plugin.Explorer/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json index e3b75219dfe..f95befd561c 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json +++ b/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", From e75ac3288a897a94a40b5931d72250a4ad2e295a Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 14 Apr 2021 22:15:49 +1000 Subject: [PATCH 3/3] update score to variable --- .../Search/QuickAccessLinks/QuickAccess.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs index 268b6a34191..55975c2a59d 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs +++ b/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 AccessLinkListMatched(Query query, List accessLinks) { if (string.IsNullOrEmpty(query.Search)) @@ -21,8 +23,8 @@ internal static List AccessLinkListMatched(Query query, List return queriedAccessLinks.Select(l => l.Type switch { - ResultType.Folder => ResultManager.CreateFolderResult(l.Name, 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(); } @@ -34,7 +36,7 @@ internal static List AccessLinkListAll(Query query, List acc .Select(l => l.Type switch { ResultType.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query), - ResultType.File => ResultManager.CreateFileResult(l.Path, query, 100), + ResultType.File => ResultManager.CreateFileResult(l.Path, query, quickAccessResultScore), _ => throw new ArgumentOutOfRangeException() }).ToList(); }