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

mini refactor to check current or previous directory once

Browse source
This commit is contained in:
Jeremy Wu 2020-06-01 07:53:34 +10:00
parent 5f13fd8a80
commit 1cea02a300
1 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
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.QuickFolderLinks;
using Flow.Launcher.Plugin.Explorer.Search.WindowsIndex; using Flow.Launcher.Plugin.Explorer.Search.WindowsIndex;
using Flow.Launcher.Plugin.SharedCommands; using Flow.Launcher.Plugin.SharedCommands;
@ -35,31 +35,35 @@ namespace Flow.Launcher.Plugin.Explorer.Search
if (!FilesFolders.IsLocationPathString(querySearch)) if (!FilesFolders.IsLocationPathString(querySearch))
return WindowsIndexFilesAndFoldersSearch(query, querySearch); return WindowsIndexFilesAndFoldersSearch(query, querySearch);
if (EnvironmentVariables.IsEnvironmentVariableSearch(querySearch)) var locationPath = query.Search;
if (EnvironmentVariables.IsEnvironmentVariableSearch(locationPath))
{ {
return EnvironmentVariables.GetEnvironmentStringPathSuggestions(querySearch, query); return EnvironmentVariables.GetEnvironmentStringPathSuggestions(locationPath, query);
} }
// Query is a location path with a full environment variable, eg. %appdata%\somefolder\ // Query is a location path with a full environment variable, eg. %appdata%\somefolder\
if (querySearch.Substring(1).Contains("%")) if (locationPath.Substring(1).Contains("%"))
{ {
querySearch = EnvironmentVariables.TranslateEnvironmentVariablePath(querySearch); locationPath = EnvironmentVariables.TranslateEnvironmentVariablePath(locationPath);
} }
var results = new List<Result>(); var results = new List<Result>();
var currentFolderResult = CreateOpenCurrentFolderResult(FilesFolders.LocationExists, querySearch, WindowsIndexExists(querySearch)); if (!FilesFolders.LocationExists(FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(locationPath)))
return results;
if (currentFolderResult == null) var indexExists = _indexSearch.PathIsIndexed(locationPath);
return new List<Result>();
results.Add(currentFolderResult); results.Add(ResultManager.CreateOpenCurrentFolderResult(FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(locationPath),
true,
indexExists));
results.AddRange(TopLevelFolderSearchBehaviour(WindowsIndexTopLevelFolderSearch, results.AddRange(TopLevelFolderSearchBehaviour(WindowsIndexTopLevelFolderSearch,
DirectoryInfoClassSearch, DirectoryInfoClassSearch,
WindowsIndexExists, indexExists,
query, query,
querySearch)); locationPath));
return results; return results;
} }
@ -101,29 +105,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
var queryConstructor = new QueryConstructor(_settings); var queryConstructor = new QueryConstructor(_settings);
return _indexSearch.WindowsIndexSearch(path, return _indexSearch.WindowsIndexSearch(path,
queryConstructor.CreateQueryHelper().ConnectionString, queryConstructor.CreateQueryHelper().ConnectionString,
queryConstructor.QueryForTopLevelDirectorySearch, queryConstructor.QueryForTopLevelDirectorySearch,
query); query);
}
private bool WindowsIndexExists(string path)
{
path = FilesFolders.GetPreviousLevelDirectoryIfPathIncomplete(path);
return _indexSearch.PathIsIndexed(path);
}
private Result CreateOpenCurrentFolderResult(Func<string, bool> locationExists, string querySearchString, bool indexExists)
{
if (locationExists(querySearchString))
return ResultManager.CreateOpenCurrentFolderResult(querySearchString, false, indexExists);
var previousDirectoryPath = FilesFolders.GetPreviousExistingDirectory(FilesFolders.LocationExists, querySearchString);
if (string.IsNullOrEmpty(previousDirectoryPath))
return null;
return ResultManager.CreateOpenCurrentFolderResult(previousDirectoryPath, true, indexExists);
} }
} }
} }