Merge pull request #387 from Flow-Launcher/fix_windowsindex_exclude

jjw24 · web-flow · commit 4dcc27900257 · 2021-03-18T14:48:18.000+11:00
Add ConfigureWait and cancellation token
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
@@ -63,10 +63,6 @@ internal async static Task<List<Result>> ExecuteWindowsIndexSearchAsync(string i
                     }
                 }
             }
-            catch (OperationCanceledException)
-            {
-                return new List<Result>(); // The source code indicates that without adding members, it won't allocate an array
-            }
             catch (InvalidOperationException e)
             {
                 // Internal error from ExecuteReader(): Connection closed.
@@ -95,12 +91,13 @@ internal async static Task<List<Result>> WindowsIndexSearchAsync(string searchSt
                 return new List<Result>();
 
             var constructedQuery = constructQuery(searchString);
-            return await RemoveResultsInExclusionList(
-                        await ExecuteWindowsIndexSearchAsync(constructedQuery, connectionString, query, token),
-                        exclusionList);
+            return RemoveResultsInExclusionList(
+                        await ExecuteWindowsIndexSearchAsync(constructedQuery, connectionString, query, token).ConfigureAwait(false),
+                        exclusionList,
+                        token);
         }
 
-        private async static Task<List<Result>> RemoveResultsInExclusionList(List<Result> results, List<AccessLink> exclusionList)
+        private static List<Result> RemoveResultsInExclusionList(List<Result> results, List<AccessLink> exclusionList, CancellationToken token)
         {
             var indexExclusionListCount = exclusionList.Count;
 
@@ -109,25 +106,26 @@ private async static Task<List<Result>> RemoveResultsInExclusionList(List<Result
 
             var filteredResults = new List<Result>();
 
-            await Task.Run(() =>
+            for (var index = 0; index < results.Count; index++)
             {
-                for (var index = 0; index < results.Count; index++)
+                token.ThrowIfCancellationRequested();
+
+                var excludeResult = false;
+
+                for (var i = 0; i < indexExclusionListCount; i++)
                 {
-                    var excludeResult = false;
+                    token.ThrowIfCancellationRequested();
 
-                    for (var i = 0; i < indexExclusionListCount; i++)
+                    if (results[index].SubTitle.StartsWith(exclusionList[i].Path, StringComparison.OrdinalIgnoreCase))
                     {
-                        if (results[index].SubTitle.StartsWith(exclusionList[i].Path, StringComparison.OrdinalIgnoreCase))
-                        {
-                            excludeResult = true;
-                            break;
-                        }
+                        excludeResult = true;
+                        break;
                     }
-
-                    if (!excludeResult)
-                        filteredResults.Add(results[index]);
                 }
-            });
+
+                if (!excludeResult)
+                    filteredResults.Add(results[index]);
+            }
 
             return filteredResults;
         }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -50,35 +50,21 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
             win32 = _win32s;
             uwps = _uwps;
 
-            try
+            var result = await Task.Run(delegate
             {
-                var result = await Task.Run(delegate
-                {
-                    try
-                    {
-                        return win32.Cast<IProgram>()
-                            .Concat(uwps)
-                            .AsParallel()
-                            .WithCancellation(token)
-                            .Where(p => p.Enabled)
-                            .Select(p => p.Result(query.Search, _context.API))
-                            .Where(r => r?.Score > 0)
-                            .ToList();
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        return null;
-                    }
-                }, token).ConfigureAwait(false);
-
-                token.ThrowIfCancellationRequested();
-
-                return result;
-            }
-            catch (OperationCanceledException)
-            {
-                return null;
-            }
+                return win32.Cast<IProgram>()
+                    .Concat(uwps)
+                    .AsParallel()
+                    .WithCancellation(token)
+                    .Where(p => p.Enabled)
+                    .Select(p => p.Result(query.Search, _context.API))
+                    .Where(r => r?.Score > 0)
+                    .ToList();
+            }, token).ConfigureAwait(false);
+
+            token.ThrowIfCancellationRequested();
+
+            return result;
         }
 
         public async Task InitAsync(PluginInitContext context)
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs
@@ -30,11 +30,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
                 Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
                 return null;
             }
-            catch (OperationCanceledException)
-            {
-                return null;
-            }
-
 
             if (string.IsNullOrEmpty(result)) return new List<string>();
             Match match = _reg.Match(result);
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
@@ -45,10 +45,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
                 Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
                 return null;
             }
-            catch (OperationCanceledException)
-            {
-                return new List<string>();
-            }
             catch (JsonException e)
             {
                 Log.Exception("|Bing.Suggestions|can't parse suggestions", e);
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
@@ -37,10 +37,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
                 Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
                 return null;
             }
-            catch (OperationCanceledException)
-            {
-                return new List<string>();
-            }
             catch (JsonException e)
             {
                 Log.Exception("|Google.Suggestions|can't parse suggestions", e);

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,6 @@ internal async static Task<List<Result>> ExecuteWindowsIndexSearchAsync(string i`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`- catch (OperationCanceledException)`
`67`		`- {`
`68`		`- return new List<Result>(); // The source code indicates that without adding members, it won't allocate an array`
`69`		`- }`
`70`	`66`	`catch (InvalidOperationException e)`
`71`	`67`	`{`
`72`	`68`	`// Internal error from ExecuteReader(): Connection closed.`
`@@ -95,12 +91,13 @@ internal async static Task<List<Result>> WindowsIndexSearchAsync(string searchSt`
`95`	`91`	`return new List<Result>();`
`96`	`92`
`97`	`93`	`var constructedQuery = constructQuery(searchString);`
`98`		`- return await RemoveResultsInExclusionList(`
`99`		`- await ExecuteWindowsIndexSearchAsync(constructedQuery, connectionString, query, token),`
`100`		`- exclusionList);`
	`94`	`+ return RemoveResultsInExclusionList(`
	`95`	`+ await ExecuteWindowsIndexSearchAsync(constructedQuery, connectionString, query, token).ConfigureAwait(false),`
	`96`	`+ exclusionList,`
	`97`	`+ token);`
`101`	`98`	`}`
`102`	`99`
`103`		`- private async static Task<List<Result>> RemoveResultsInExclusionList(List<Result> results, List<AccessLink> exclusionList)`
	`100`	`+ private static List<Result> RemoveResultsInExclusionList(List<Result> results, List<AccessLink> exclusionList, CancellationToken token)`
`104`	`101`	`{`
`105`	`102`	`var indexExclusionListCount = exclusionList.Count;`
`106`	`103`
`@@ -109,25 +106,26 @@ private async static Task<List<Result>> RemoveResultsInExclusionList(List<Result`
`109`	`106`
`110`	`107`	`var filteredResults = new List<Result>();`
`111`	`108`
`112`		`- await Task.Run(() =>`
	`109`	`+ for (var index = 0; index < results.Count; index++)`
`113`	`110`	`{`
`114`		`- for (var index = 0; index < results.Count; index++)`
	`111`	`+ token.ThrowIfCancellationRequested();`
	`112`	`+`
	`113`	`+ var excludeResult = false;`
	`114`	`+`
	`115`	`+ for (var i = 0; i < indexExclusionListCount; i++)`
`115`	`116`	`{`
`116`		`- var excludeResult = false;`
	`117`	`+ token.ThrowIfCancellationRequested();`
`117`	`118`
`118`		`- for (var i = 0; i < indexExclusionListCount; i++)`
	`119`	`+ if (results[index].SubTitle.StartsWith(exclusionList[i].Path, StringComparison.OrdinalIgnoreCase))`
`119`	`120`	`{`
`120`		`- if (results[index].SubTitle.StartsWith(exclusionList[i].Path, StringComparison.OrdinalIgnoreCase))`
`121`		`- {`
`122`		`- excludeResult = true;`
`123`		`- break;`
`124`		`- }`
	`121`	`+ excludeResult = true;`
	`122`	`+ break;`
`125`	`123`	`}`
`126`		`-`
`127`		`- if (!excludeResult)`
`128`		`- filteredResults.Add(results[index]);`
`129`	`124`	`}`
`130`		`- });`
	`125`	`+`
	`126`	`+ if (!excludeResult)`
	`127`	`+ filteredResults.Add(results[index]);`
	`128`	`+ }`
`131`	`129`
`132`	`130`	`return filteredResults;`
`133`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT`
`45`	`45`	`Log.Exception("\|Baidu.Suggestions\|Can't get suggestion from baidu", e);`
`46`	`46`	`return null;`
`47`	`47`	`}`
`48`		`- catch (OperationCanceledException)`
`49`		`- {`
`50`		`- return new List<string>();`
`51`		`- }`
`52`	`48`	`catch (JsonException e)`
`53`	`49`	`{`
`54`	`50`	`Log.Exception("\|Bing.Suggestions\|can't parse suggestions", e);`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT`
`37`	`37`	`Log.Exception("\|Baidu.Suggestions\|Can't get suggestion from baidu", e);`
`38`	`38`	`return null;`
`39`	`39`	`}`
`40`		`- catch (OperationCanceledException)`
`41`		`- {`
`42`		`- return new List<string>();`
`43`		`- }`
`44`	`40`	`catch (JsonException e)`
`45`	`41`	`{`
`46`	`42`	`Log.Exception("\|Google.Suggestions\|can't parse suggestions", e);`