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

Add method to construct search criteria for DirectoryInfoSeach

Browse source
This commit is contained in:
Jeremy Wu 2020-05-28 08:56:55 +10:00
parent a478e20352
commit ddffa52aca
2 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
View file

@ -10,40 +10,26 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
{
public class DirectoryInfoSearch
{
private PluginInitContext _context;
private Settings _settings;
public DirectoryInfoSearch(Settings settings, PluginInitContext context)
public DirectoryInfoSearch(Settings settings)
{
_context = context;
_settings = settings;
}
internal List<Result> DirectoryAllFilesFoldersSearch(Query query, string search)
{
return DirectorySearch(SearchOption.AllDirectories, query, search);
}
internal List<Result> TopLevelDirectorySearch(Query query, string search)
{
return DirectorySearch(SearchOption.TopDirectoryOnly, query, search);
var criteria = ConstructSearchCriteria(search);
if (search.IndexOfAny(Constants.SpecialSearchChars) >= 0)
return DirectorySearch(SearchOption.AllDirectories, query, search, criteria);
return DirectorySearch(SearchOption.TopDirectoryOnly, query, search, criteria);
}
private List<Result> DirectorySearch(SearchOption searchOption, Query query, string search)
public string ConstructSearchCriteria(string search)
{
var results = new List<Result>();
//var hasSpecial = search.IndexOfAny(_specialSearchChars) >= 0;
string incompleteName = "";
//if (hasSpecial || !Directory.Exists(search + "\\"))
//// give the ability to search all folder when starting with >
//if (incompleteName.StartsWith(">"))
//{
// searchOption = SearchOption.AllDirectories;
// // match everything before and after search term using supported wildcard '*', ie. *searchterm*
// incompleteName = "*" + incompleteName.Substring(1);
//}
if (!search.EndsWith("\\"))
{
@ -52,18 +38,36 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
incompleteName = search.Substring(indexOfSeparator + 1).ToLower();
search = search.Substring(0, indexOfSeparator + 1);
if (incompleteName.StartsWith(">"))
incompleteName = "*" + incompleteName.Substring(1);
}
incompleteName += "*";
return incompleteName;
}
private List<Result> DirectorySearch(SearchOption searchOption, Query query, string search, string searchCriteria)
{
var results = new List<Result>();
var path = search;
if (!search.EndsWith("\\"))
{
// not full path, get previous level directory string
var indexOfSeparator = search.LastIndexOf('\\');
path = search.Substring(0, indexOfSeparator + 1);
}
var folderList = new List<Result>();
var fileList = new List<Result>();
try
{
var directoryInfo = new System.IO.DirectoryInfo(search);
var fileSystemInfos = directoryInfo.GetFileSystemInfos(incompleteName, searchOption);
var directoryInfo = new System.IO.DirectoryInfo(path);
var fileSystemInfos = directoryInfo.GetFileSystemInfos(searchCriteria, searchOption);
foreach (var fileSystemInfo in fileSystemInfos)
{

2
Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
View file

@ -66,7 +66,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
private List<Result> DirectoryInfoClassSearch(Query query, string querySearch)
{
var directoryInfoSearch = new DirectoryInfoSearch(_settings, _context);
var directoryInfoSearch = new DirectoryInfoSearch(_settings);
return directoryInfoSearch.TopLevelDirectorySearch(query, querySearch);
}