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 Cancellation token for file system enumeration

Browse source
This commit is contained in:
张弘韬 2021-01-19 10:08:37 +08:00
parent e9e99ab338
commit d7abae1ab2
2 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading;
namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
{ {
@ -16,14 +17,18 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
resultManager = new ResultManager(context); resultManager = new ResultManager(context);
} }
internal List<Result> TopLevelDirectorySearch(Query query, string search) internal List<Result> TopLevelDirectorySearch(Query query, string search, CancellationToken token)
{ {
var criteria = ConstructSearchCriteria(search); var criteria = ConstructSearchCriteria(search);
if (search.LastIndexOf(Constants.AllFilesFolderSearchWildcard) > search.LastIndexOf(Constants.DirectorySeperator)) if (search.LastIndexOf(Constants.AllFilesFolderSearchWildcard) >
return DirectorySearch(SearchOption.AllDirectories, query, search, criteria); search.LastIndexOf(Constants.DirectorySeperator))
return DirectorySearch(new EnumerationOptions
{
RecurseSubdirectories = true
}, query, search, criteria, token);
return DirectorySearch(SearchOption.TopDirectoryOnly, query, search, criteria); return DirectorySearch(null, query, search, criteria, token); // null will be passed as default
} }
public string ConstructSearchCriteria(string search) public string ConstructSearchCriteria(string search)
@ -45,7 +50,8 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
return incompleteName; return incompleteName;
} }
private List<Result> DirectorySearch(SearchOption searchOption, Query query, string search, string searchCriteria) private List<Result> DirectorySearch(EnumerationOptions enumerationOption, Query query, string search,
string searchCriteria, CancellationToken token)
{ {
var results = new List<Result>(); var results = new List<Result>();
@ -58,37 +64,37 @@ namespace Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo
{ {
var directoryInfo = new System.IO.DirectoryInfo(path); var directoryInfo = new System.IO.DirectoryInfo(path);
foreach (var fileSystemInfo in directoryInfo.EnumerateFileSystemInfos(searchCriteria, searchOption)) foreach (var fileSystemInfo in directoryInfo.EnumerateFileSystemInfos(searchCriteria, enumerationOption))
{ {
if ((fileSystemInfo.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) continue;
if (fileSystemInfo is System.IO.DirectoryInfo) if (fileSystemInfo is System.IO.DirectoryInfo)
{ {
folderList.Add(resultManager.CreateFolderResult(fileSystemInfo.Name, fileSystemInfo.FullName, fileSystemInfo.FullName, query, true, false)); folderList.Add(resultManager.CreateFolderResult(fileSystemInfo.Name, fileSystemInfo.FullName,
fileSystemInfo.FullName, query, true, false));
} }
else else
{ {
fileList.Add(resultManager.CreateFileResult(fileSystemInfo.FullName, query, true, false)); fileList.Add(resultManager.CreateFileResult(fileSystemInfo.FullName, query, true, false));
} }
if (token.IsCancellationRequested)
return null;
} }
} }
catch (Exception e) catch (Exception e)
{ {
if (e is UnauthorizedAccessException || e is ArgumentException) if (!(e is ArgumentException)) throw e;
{
results.Add(new Result { Title = e.Message, Score = 501 });
return results; results.Add(new Result {Title = e.Message, Score = 501});
}
return results;
#if DEBUG // Please investigate and handle error from DirectoryInfo search #if DEBUG // Please investigate and handle error from DirectoryInfo search
throw e;
#else #else
Log.Exception($"|Flow.Launcher.Plugin.Explorer.DirectoryInfoSearch|Error from performing DirectoryInfoSearch", e); Log.Exception($"|Flow.Launcher.Plugin.Explorer.DirectoryInfoSearch|Error from performing DirectoryInfoSearch", e);
#endif #endif
} }
// Intial ordering, this order can be updated later by UpdateResultView.MainViewModel based on history of user selection. // Initial ordering, this order can be updated later by UpdateResultView.MainViewModel based on history of user selection.
return results.Concat(folderList.OrderBy(x => x.Title)).Concat(fileList.OrderBy(x => x.Title)).ToList(); return results.Concat(folderList.OrderBy(x => x.Title)).Concat(fileList.OrderBy(x => x.Title)).ToList();
} }
} }

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

@ -81,11 +81,11 @@ namespace Flow.Launcher.Plugin.Explorer.Search
return null; return null;
results.AddRange(await TopLevelDirectorySearchBehaviourAsync(WindowsIndexTopLevelFolderSearchAsync, results.AddRange(await TopLevelDirectorySearchBehaviourAsync(WindowsIndexTopLevelFolderSearchAsync,
DirectoryInfoClassSearch, DirectoryInfoClassSearch,
useIndexSearch, useIndexSearch,
query, query,
locationPath, locationPath,
token).ConfigureAwait(false)); token).ConfigureAwait(false));
return results; return results;
} }
@ -109,23 +109,23 @@ namespace Flow.Launcher.Plugin.Explorer.Search
return actionKeyword == settings.FileContentSearchActionKeyword; return actionKeyword == settings.FileContentSearchActionKeyword;
} }
private List<Result> DirectoryInfoClassSearch(Query query, string querySearch) private List<Result> DirectoryInfoClassSearch(Query query, string querySearch, CancellationToken token)
{ {
var directoryInfoSearch = new DirectoryInfoSearch(context); var directoryInfoSearch = new DirectoryInfoSearch(context);
return directoryInfoSearch.TopLevelDirectorySearch(query, querySearch); return directoryInfoSearch.TopLevelDirectorySearch(query, querySearch, token);
} }
public async Task<List<Result>> TopLevelDirectorySearchBehaviourAsync( public async Task<List<Result>> TopLevelDirectorySearchBehaviourAsync(
Func<Query, string, CancellationToken, Task<List<Result>>> windowsIndexSearch, Func<Query, string, CancellationToken, Task<List<Result>>> windowsIndexSearch,
Func<Query, string, List<Result>> directoryInfoClassSearch, Func<Query, string, CancellationToken, List<Result>> directoryInfoClassSearch,
bool useIndexSearch, bool useIndexSearch,
Query query, Query query,
string querySearchString, string querySearchString,
CancellationToken token) CancellationToken token)
{ {
if (!useIndexSearch) if (!useIndexSearch)
return directoryInfoClassSearch(query, querySearchString); return directoryInfoClassSearch(query, querySearchString, token);
return await windowsIndexSearch(query, querySearchString, token); return await windowsIndexSearch(query, querySearchString, token);
} }