Skip to content

Commit 1ed1c99

Browse files
author
TheBestPessimist
committed
Revert "add scoring based on index and small optimization"
This reverts commit 02b321c.
1 parent 02b321c commit 1ed1c99

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingAPI.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public static async ValueTask<bool> IsEverythingRunningAsync(CancellationToken t
5959
{
6060
EverythingApiDllImport.Everything_GetMajorVersion();
6161
var result = EverythingApiDllImport.Everything_GetLastError() != StateCode.IPCError;
62-
6362
return result;
6463
}
6564
finally
@@ -68,8 +67,6 @@ public static async ValueTask<bool> IsEverythingRunningAsync(CancellationToken t
6867
}
6968
}
7069

71-
const int ScoreScaleFactor = 5;
72-
7370
/// <summary>
7471
/// Searches the specified key word and reset the everything API afterwards
7572
/// </summary>
@@ -118,7 +115,7 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
118115

119116
EverythingApiDllImport.Everything_SetSort(option.SortOption);
120117
EverythingApiDllImport.Everything_SetMatchPath(option.IsFullPathSearch);
121-
118+
122119
if (option.SortOption == SortOption.RUN_COUNT_DESCENDING)
123120
{
124121
EverythingApiDllImport.Everything_SetRequestFlags(EVERYTHING_REQUEST_FULL_PATH_AND_FILE_NAME | EVERYTHING_REQUEST_RUN_COUNT);
@@ -135,13 +132,10 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
135132
if (!EverythingApiDllImport.Everything_QueryW(true))
136133
{
137134
CheckAndThrowExceptionOnError();
138-
139135
yield break;
140136
}
141137

142-
var numResults = EverythingApiDllImport.Everything_GetNumResults();
143-
144-
for (var idx = 0; idx < numResults; ++idx)
138+
for (var idx = 0; idx < EverythingApiDllImport.Everything_GetNumResults(); ++idx)
145139
{
146140
if (token.IsCancellationRequested)
147141
{
@@ -157,8 +151,7 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
157151
Type = EverythingApiDllImport.Everything_IsFolderResult(idx) ? ResultType.Folder :
158152
EverythingApiDllImport.Everything_IsFileResult(idx) ? ResultType.File :
159153
ResultType.Volume,
160-
Score = (option.SortOption is SortOption.RUN_COUNT_DESCENDING ? (int)EverythingApiDllImport.Everything_GetResultRunCount((uint)idx) : 0) * ScoreScaleFactor,
161-
WindowsIndexed = false
154+
Score = (int)EverythingApiDllImport.Everything_GetResultRunCount( (uint)idx)
162155
};
163156

164157
yield return result;
@@ -199,7 +192,6 @@ private static void CheckAndThrowExceptionOnError()
199192
public static async Task IncrementRunCounterAsync(string fileOrFolder)
200193
{
201194
await _semaphore.WaitAsync(TimeSpan.FromSeconds(1));
202-
203195
try
204196
{
205197
_ = EverythingApiDllImport.Everything_IncRunCountFromFileName(fileOrFolder);

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ public SearchManager(Settings settings, PluginInitContext context)
2929
public class PathEqualityComparator : IEqualityComparer<Result>
3030
{
3131
private static PathEqualityComparator instance;
32-
3332
public static PathEqualityComparator Instance => instance ??= new PathEqualityComparator();
3433

3534
public bool Equals(Result x, Result y)
3635
{
3736
return x.Title.Equals(y.Title, StringComparison.OrdinalIgnoreCase)
38-
&& string.Equals(x.SubTitle, y.SubTitle, StringComparison.OrdinalIgnoreCase);
37+
&& string.Equals(x.SubTitle, y.SubTitle, StringComparison.OrdinalIgnoreCase);
3938
}
4039

4140
public int GetHashCode(Result obj)
@@ -107,10 +106,7 @@ when ActionKeywordMatch(query, Settings.ActionKeyword.IndexSearchActionKeyword)
107106

108107
try
109108
{
110-
await foreach (var search in searchResults.Select((r, i) => r with
111-
{
112-
Score = -i + 50
113-
}).WithCancellation(token).ConfigureAwait(false))
109+
await foreach (var search in searchResults.WithCancellation(token).ConfigureAwait(false))
114110
results.Add(ResultManager.CreateResult(query, search));
115111
}
116112
catch (OperationCanceledException)

0 commit comments

Comments
 (0)