Use Window Search Orderby instead of getting the result and order them by filename

Author: taooceros

Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs

@@ -24,9 +24,8 @@ internal IndexSearch(PluginInitContext context)
 
         internal async Task<List<Result>> ExecuteWindowsIndexSearchAsync(string indexQueryString, string connectionString, Query query, CancellationToken token)
         {
-            var folderResults = new List<Result>();
-            var fileResults = new List<Result>();
             var results = new List<Result>();
+            var fileResults = new List<Result>();
 
             try
             {
@@ -55,7 +54,7 @@ internal async Task<List<Result>> ExecuteWindowsIndexSearchAsync(string indexQue
 
                             if (dataReaderResults.GetString(2) == "Directory")
                             {
-                                folderResults.Add(resultManager.CreateFolderResult(
+                                results.Add(resultManager.CreateFolderResult(
                                                                     dataReaderResults.GetString(0),
                                                                     path,
                                                                     path,
@@ -83,8 +82,10 @@ internal async Task<List<Result>> ExecuteWindowsIndexSearchAsync(string indexQue
                 LogException("General error from performing index search", e);
             }
 
+            results.AddRange(fileResults);
+
             // Intial ordering, this order can be updated later by UpdateResultView.MainViewModel based on history of user selection.
-            return results.Concat(folderResults.OrderBy(x => x.Title)).Concat(fileResults.OrderBy(x => x.Title)).ToList(); ;
+             return results;
         }
 
         internal async Task<List<Result>> WindowsIndexSearchAsync(string searchString, string connectionString,

Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/QueryConstructor.cs

@@ -42,7 +42,7 @@ internal CSearchQueryHelper CreateQueryHelper()
 
             // Get the ISearchQueryHelper which will help us to translate AQS --> SQL necessary to query the indexer
             var queryHelper = catalogManager.GetQueryHelper();
-
+            
             return queryHelper;
         }
 
@@ -81,11 +81,9 @@ private string QueryWhereRestrictionsFromLocationPath(string path, string search
             var previousLevelDirectory = path.Substring(0, indexOfSeparator);
 
             if (string.IsNullOrEmpty(itemName))
-                return searchDepth + $"{previousLevelDirectory}'";
+                return $"{searchDepth}{previousLevelDirectory}'{QueryOrderByFileNameRestriction}";
 
-            return $"(System.FileName LIKE '{itemName}%' " +
-                    $"OR CONTAINS(System.FileName,'\"{itemName}*\"',1033)) AND " +
-                    searchDepth + $"{previousLevelDirectory}'";
+            return $"(System.FileName LIKE '{itemName}%' OR CONTAINS(System.FileName,'\"{itemName}*\"',1033)) AND {searchDepth}{previousLevelDirectory}' {QueryOrderByFileNameRestriction}";
         }
 
         ///<summary>
@@ -98,7 +96,7 @@ public string QueryForTopLevelDirectorySearch(string path)
             if (path.LastIndexOf(Constants.AllFilesFolderSearchWildcard) > path.LastIndexOf(Constants.DirectorySeperator))
                 return query + QueryWhereRestrictionsForTopLevelDirectoryAllFilesAndFoldersSearch(path);
 
-            return query + QueryWhereRestrictionsForTopLevelDirectorySearch(path);
+            return query + QueryWhereRestrictionsForTopLevelDirectorySearch(path) + QueryOrderByFileNameRestriction;
         }
 
         ///<summary>
@@ -107,16 +105,17 @@ public string QueryForTopLevelDirectorySearch(string path)
         public string QueryForAllFilesAndFolders(string userSearchString)
         {
             // Generate SQL from constructed parameters, converting the userSearchString from AQS->WHERE clause
-            return CreateBaseQuery().GenerateSQLFromUserQuery(userSearchString) + " AND " + QueryWhereRestrictionsForAllFilesAndFoldersSearch();
+            return CreateBaseQuery().GenerateSQLFromUserQuery(userSearchString) + " AND " + QueryWhereRestrictionsForAllFilesAndFoldersSearch
+                + QueryOrderByFileNameRestriction;
         }
 
         ///<summary>
         /// Set the required WHERE clause restriction to search for all files and folders.
         ///</summary>
-        public string QueryWhereRestrictionsForAllFilesAndFoldersSearch()
-        {
-            return $"scope='file:'";
-        }
+        public const string QueryWhereRestrictionsForAllFilesAndFoldersSearch = "scope='file:'";
+
+        public const string QueryOrderByFileNameRestriction = " ORDER BY System.FileName";
+
 
         ///<summary>
         /// Search will be performed on all indexed file contents for the specified search keywords.
@@ -125,7 +124,8 @@ public string QueryForFileContentSearch(string userSearchString)
         {
             string query = "SELECT TOP " + settings.MaxResult + $" {CreateBaseQuery().QuerySelectColumns} FROM {SystemIndex} WHERE ";
 
-            return query + QueryWhereRestrictionsForFileContentSearch(userSearchString) + " AND " + QueryWhereRestrictionsForAllFilesAndFoldersSearch();
+            return query + QueryWhereRestrictionsForFileContentSearch(userSearchString) + " AND " + QueryWhereRestrictionsForAllFilesAndFoldersSearch
+                + QueryOrderByFileNameRestriction;
         }
 
         ///<summary>