prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove the redundant path in brackets and update Nickname to Name

Browse source
This commit is contained in:
Jeremy Wu 2021-04-14 22:11:40 +10:00
parent 0b0a185596
commit aee5f6617e
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/AccessLink.cs
View file

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

12
Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs
View file

@ -15,29 +15,27 @@ namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks
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<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.Folder => ResultManager.CreateFolderResult(l.Name, l.Path, l.Path, query),
ResultType.File => ResultManager.CreateFileResult(l.Path, query, 100),
_ => throw new ArgumentOutOfRangeException()
}).ToList();
}
}