use actual path variable consistently throughout path search

Flow-Launcher · Jul 13, 2024 · 4b78926 · 4b78926
1 parent 67ae8e5
commit 4b78926
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo;
+using Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo;
 using Flow.Launcher.Plugin.Explorer.Search.Everything;
 using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
 using Flow.Launcher.Plugin.SharedCommands;
@@ -180,16 +180,16 @@ private async Task<List<Result>> PathSearchAsync(Query query, CancellationToken
 
             // Query is a location path with a full environment variable, eg. %appdata%\somefolder\, c:\users\%USERNAME%\downloads
             var needToExpand = EnvironmentVariables.HasEnvironmentVar(querySearch);
-            var locationPath = needToExpand ? Environment.ExpandEnvironmentVariables(querySearch) : querySearch;
+            var path = needToExpand ? Environment.ExpandEnvironmentVariables(querySearch) : querySearch;
 
             // Check that actual location exists, otherwise directory search will throw directory not found exception
-            if (!FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath).LocationExists())
+            if (!FilesFolders.ReturnPreviousDirectoryIfIncompleteString(path).LocationExists())
                 return results.ToList();
 
             var useIndexSearch = Settings.IndexSearchEngine is Settings.IndexSearchEngineOption.WindowsIndex
-                                 && UseWindowsIndexForDirectorySearch(locationPath);
+                                 && UseWindowsIndexForDirectorySearch(path);
 
-            var retrievedDirectoryPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath);
+            var retrievedDirectoryPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(path);
 
             results.Add(retrievedDirectoryPath.EndsWith(":\\")
                 ? ResultManager.CreateDriveSpaceDisplayResult(retrievedDirectoryPath, query.ActionKeyword, useIndexSearch)
@@ -200,21 +200,21 @@ private async Task<List<Result>> PathSearchAsync(Query query, CancellationToken
 
             IAsyncEnumerable<SearchResult> directoryResult;
 
-            var recursiveIndicatorIndex = query.Search.IndexOf('>');
+            var recursiveIndicatorIndex = path.IndexOf('>');
 
             if (recursiveIndicatorIndex > 0 && Settings.PathEnumerationEngine != Settings.PathEnumerationEngineOption.DirectEnumeration)
             {
                 directoryResult =
                     Settings.PathEnumerator.EnumerateAsync(
-                        query.Search[..recursiveIndicatorIndex].Trim(),
-                        query.Search[(recursiveIndicatorIndex + 1)..],
+                        path[..recursiveIndicatorIndex].Trim(),
+                        path[(recursiveIndicatorIndex + 1)..],
                         true,
                         token);
 
             }
             else
             {
-                directoryResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, query.Search, token).ToAsyncEnumerable();
+                directoryResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, path, token).ToAsyncEnumerable();
             }
 
             if (token.IsCancellationRequested)