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 condition for using Windows Index Search

Browse source
This commit is contained in:
Jeremy Wu 2020-06-02 20:12:14 +10:00
parent 7629778610
commit 5c46464a41
2 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,10 @@
using Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo;
using Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo;
using Flow.Launcher.Plugin.Explorer.Search.QuickFolderLinks;
using Flow.Launcher.Plugin.Explorer.Search.WindowsIndex;
using Flow.Launcher.Plugin.SharedCommands;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Flow.Launcher.Plugin.Explorer.Search
{
@ -53,15 +54,15 @@ namespace Flow.Launcher.Plugin.Explorer.Search
if (!FilesFolders.LocationExists(FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(locationPath)))
return results;
var indexExists = _indexSearch.PathIsIndexed(locationPath);
var useIndexSearch = UseWindowsIndexForDirectorySearch(locationPath);
results.Add(ResultManager.CreateOpenCurrentFolderResult(locationPath, indexExists));
results.Add(ResultManager.CreateOpenCurrentFolderResult(locationPath, useIndexSearch));
results.AddRange(TopLevelDirectorySearchBehaviour(WindowsIndexTopLevelFolderSearch,
DirectoryInfoClassSearch,
indexExists,
query,
locationPath));
useIndexSearch,
query,
locationPath));
return results;
}
@ -76,11 +77,11 @@ namespace Flow.Launcher.Plugin.Explorer.Search
public List<Result> TopLevelDirectorySearchBehaviour(
Func<Query, string, List<Result>> windowsIndexSearch,
Func<Query, string, List<Result>> directoryInfoClassSearch,
bool indexExists,
bool useIndexSearch,
Query query,
string querySearchString)
{
if (!indexExists)
if (!useIndexSearch)
return directoryInfoClassSearch(query, querySearchString);
return windowsIndexSearch(query, querySearchString);
@ -91,9 +92,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
var queryConstructor = new QueryConstructor(_settings);
return _indexSearch.WindowsIndexSearch(querySearchString,
queryConstructor.CreateQueryHelper().ConnectionString,
queryConstructor.QueryForAllFilesAndFolders,
query);
queryConstructor.CreateQueryHelper().ConnectionString,
queryConstructor.QueryForAllFilesAndFolders,
query);
}
private List<Result> WindowsIndexTopLevelFolderSearch(Query query, string path)
@ -105,5 +106,17 @@ namespace Flow.Launcher.Plugin.Explorer.Search
queryConstructor.QueryForTopLevelDirectorySearch,
query);
}
private bool UseWindowsIndexForDirectorySearch(string locationPath)
{
if (!_settings.UseWindowsIndexForDirectorySearch)
return false;
if (_settings.WindowsIndexExcludedDirectories
.Any(x => x.Path == FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(locationPath)))
return false;
return _indexSearch.PathIsIndexed(locationPath);
}
}
}

6
Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
View file

@ -12,5 +12,11 @@ namespace Flow.Launcher.Plugin.Explorer
[JsonProperty]
public List<FolderLink> FolderLinks { get; set; } = new List<FolderLink>();
[JsonProperty]
public bool UseWindowsIndexForDirectorySearch { get; set; } = true;
[JsonProperty]
public List<FolderLink> WindowsIndexExcludedDirectories { get; set; } = new List<FolderLink>();
}
}