Skip to content

Commit 136a4aa

Browse files
committed
Code quality
1 parent cd916b3 commit 136a4aa

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ internal CSearchQueryHelper CreateQueryHelper()
6060
///</summary>
6161
public string Directory(ReadOnlySpan<char> path, ReadOnlySpan<char> searchString = default, bool recursive = false)
6262
{
63-
var queryConstraint = searchString.IsWhiteSpace() ? "" : $"AND ({FileName} LIKE '{searchString}%' OR CONTAINS({FileName},'\"{searchString}*\"'))";
63+
var queryConstraint = searchString.IsWhiteSpace() ? "" : $"AND ({OrderIdentifier} LIKE '{searchString}%' OR CONTAINS({OrderIdentifier},'\"{searchString}*\"'))";
6464

6565
var scopeConstraint = recursive
6666
? RecursiveDirectoryConstraint(path)
6767
: TopLevelDirectoryConstraint(path);
6868

69-
var query = $"SELECT TOP {settings.MaxResult} {CreateBaseQuery().QuerySelectColumns} FROM {SystemIndex} WHERE {scopeConstraint} {queryConstraint} ORDER BY {FileName}";
69+
var query = $"SELECT TOP {settings.MaxResult} {CreateBaseQuery().QuerySelectColumns} FROM {SystemIndex} WHERE {scopeConstraint} {queryConstraint} ORDER BY {OrderIdentifier}";
7070

7171
return query;
7272
}
@@ -83,7 +83,7 @@ public string FilesAndFolders(ReadOnlySpan<char> userSearchString)
8383
var replacedSearchString = ReplaceSpecialCharacterWithTwoSideWhiteSpace(userSearchString);
8484

8585
// Generate SQL from constructed parameters, converting the userSearchString from AQS->WHERE clause
86-
return $"{CreateBaseQuery().GenerateSQLFromUserQuery(replacedSearchString)} AND {RestrictionsForAllFilesAndFoldersSearch} ORDER BY {FileName}";
86+
return $"{CreateBaseQuery().GenerateSQLFromUserQuery(replacedSearchString)} AND {RestrictionsForAllFilesAndFoldersSearch} ORDER BY {OrderIdentifier}";
8787
}
8888

8989
/// <summary>
@@ -120,17 +120,20 @@ private static string ReplaceSpecialCharacterWithTwoSideWhiteSpace(ReadOnlySpan<
120120
public const string RestrictionsForAllFilesAndFoldersSearch = "scope='file:'";
121121

122122
/// <summary>
123-
/// Order identifier: file name
123+
/// Order identifier: System.Search.Rank DESC
124124
/// </summary>
125-
public const string FileName = "System.Search.Rank DESC";
125+
/// <remarks>
126+
/// <see href="https://docs.microsoft.com/en-us/windows/win32/properties/props-system-search-rank"/>
127+
/// </remarks>
128+
public const string OrderIdentifier = "System.Search.Rank DESC";
126129

127130
///<summary>
128131
/// Search will be performed on all indexed file contents for the specified search keywords.
129132
///</summary>
130133
public string FileContent(ReadOnlySpan<char> userSearchString)
131134
{
132135
string query =
133-
$"SELECT TOP {settings.MaxResult} {CreateBaseQuery().QuerySelectColumns} FROM {SystemIndex} WHERE {RestrictionsForFileContentSearch(userSearchString)} AND {RestrictionsForAllFilesAndFoldersSearch} ORDER BY {FileName}";
136+
$"SELECT TOP {settings.MaxResult} {CreateBaseQuery().QuerySelectColumns} FROM {SystemIndex} WHERE {RestrictionsForFileContentSearch(userSearchString)} AND {RestrictionsForAllFilesAndFoldersSearch} ORDER BY {OrderIdentifier}";
134137

135138
return query;
136139
}

0 commit comments

Comments
 (0)