Merge pull request #309 from taooceros/ExplorerDirectorySearchWithIndexFix

Fix unrecognized path

Author: jjw24

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -146,31 +146,23 @@ public static void OpenContainingFolder(string path)
         /// This checks whether a given string is a directory path or network location string. 
         /// It does not check if location actually exists.
         ///</summary>
-        public static bool IsLocationPathString(string querySearchString)
+        public static bool IsLocationPathString(this string querySearchString)
         {
-            if (string.IsNullOrEmpty(querySearchString))
+            if (string.IsNullOrEmpty(querySearchString) || querySearchString.Length < 3)
                 return false;
 
             // // shared folder location, and not \\\location\
-            if (querySearchString.Length >= 3
-                && querySearchString.StartsWith(@"\\")
-                && char.IsLetter(querySearchString[2]))
+            if (querySearchString.StartsWith(@"\\")
+                && querySearchString[2] != '\\')
                 return true;
 
             // c:\
-            if (querySearchString.Length == 3
-                && char.IsLetter(querySearchString[0])
+            if (char.IsLetter(querySearchString[0])
                 && querySearchString[1] == ':'
                 && querySearchString[2] == '\\')
-                return true;
-
-            // c:\\
-            if (querySearchString.Length >= 4
-                && char.IsLetter(querySearchString[0])
-                && querySearchString[1] == ':'
-                && querySearchString[2] == '\\'
-                && char.IsLetter(querySearchString[3]))
-                return true;
+            {
+                return querySearchString.Length == 3 || querySearchString[3] != '\\';
+            }
 
             return false;
         }

Flow.Launcher.Test/Plugins/ExplorerTest.cs

@@ -240,6 +240,9 @@ public void GivenQuery_WhenActionKeywordForFileContentSearchExists_ThenFileConte
         [TestCase(@"cc:\", false)]
         [TestCase(@"\\\SomeNetworkLocation\", false)]
         [TestCase("RandomFile", false)]
+        [TestCase(@"c:\>*", true)]
+        [TestCase(@"c:\>", true)]
+        [TestCase(@"c:\SomeLocation\SomeOtherLocation\>", true)]
         public void WhenGivenQuerySearchString_ThenShouldIndicateIfIsLocationPathString(string querySearchString, bool expectedResult)
         {
             // When, Given

Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs

@@ -58,7 +58,7 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
             // Query is a location path with a full environment variable, eg. %appdata%\somefolder\
             var isEnvironmentVariablePath = querySearch[1..].Contains("%\\");
 
-            if (!FilesFolders.IsLocationPathString(querySearch) && !isEnvironmentVariablePath)
+            if (!querySearch.IsLocationPathString() && !isEnvironmentVariablePath)
             {
                 results.AddRange(await WindowsIndexFilesAndFoldersSearchAsync(query, querySearch, token).ConfigureAwait(false));
 
@@ -70,6 +70,7 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
             if (isEnvironmentVariablePath)
                 locationPath = EnvironmentVariables.TranslateEnvironmentVariablePath(locationPath);
 
+            // Check that actual location exists, otherwise directory search will throw directory not found exception
             if (!FilesFolders.LocationExists(FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath)))
                 return results;
 

Plugins/Flow.Launcher.Plugin.Explorer/plugin.json

@@ -7,7 +7,7 @@
   "Name": "Explorer",
   "Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
   "Author": "Jeremy Wu",
-  "Version": "1.4.0",
+  "Version": "1.4.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",