Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 19:57:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Optimised result binding by inserting search result from multiple plugin in parallel

Browse Source
This commit is contained in:
Divyansh
2020-04-02 10:30:57 -07:00
parent 5a13850043
commit d73ab36dc3
1 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/modules/launcher/Wox/ViewModel/MainViewModel.cs
View File

@@ -393,24 +393,31 @@ namespace Wox.ViewModel
}, currentCancellationToken); }, currentCancellationToken);
var plugins = PluginManager.ValidPluginsForQuery(query); var plugins = PluginManager.ValidPluginsForQuery(query);
Application.Current.Dispatcher.Invoke((Action)(() => {
Task.Run(() =>
{
// so looping will stop once it was cancelled // so looping will stop once it was cancelled
var parallelOptions = new ParallelOptions { CancellationToken = currentCancellationToken }; var parallelOptions = new ParallelOptions { CancellationToken = currentCancellationToken };
try try
{ {
//Parallel.ForEach(plugins, parallelOptions, plugin => Parallel.ForEach(plugins, parallelOptions, plugin =>
//{
// if (!plugin.Metadata.Disabled)
// {
// var results = PluginManager.QueryForPlugin(plugin, query);
// UpdateResultView(results, plugin.Metadata, query);
// }
//});
foreach(PluginPair plugin in plugins)
{ {
var results = PluginManager.QueryForPlugin(plugin, query); if (!plugin.Metadata.Disabled)
UpdateResultView(results, plugin.Metadata, query); {
} var results = PluginManager.QueryForPlugin(plugin, query);
if (Application.Current.Dispatcher.CheckAccess())
{
UpdateResultView(results, plugin.Metadata, query);
}
else
{
Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{
UpdateResultView(results, plugin.Metadata, query);
}));
}
}
});
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
@@ -425,40 +432,7 @@ namespace Wox.ViewModel
{ // update to hidden if this is still the current query { // update to hidden if this is still the current query
ProgressBarVisibility = Visibility.Hidden; ProgressBarVisibility = Visibility.Hidden;
} }
})); }, currentCancellationToken);
//Task.Run(() =>
//{
// // so looping will stop once it was cancelled
// var parallelOptions = new ParallelOptions { CancellationToken = currentCancellationToken };
// try
// {
// Parallel.ForEach(plugins, parallelOptions, plugin =>
// {
// if (!plugin.Metadata.Disabled)
// {
// var results = PluginManager.QueryForPlugin(plugin, query);
// UpdateResultView(results, plugin.Metadata, query);
// }
// });
// }
// catch (OperationCanceledException)
// {
// // nothing to do here
// }
// // this should happen once after all queries are done so progress bar should continue
// // until the end of all querying
// _isQueryRunning = false;
// if (currentUpdateSource == _updateSource)
// { // update to hidden if this is still the current query
// ProgressBarVisibility = Visibility.Hidden;
// }
//}, currentCancellationToken);
} }
} }
else else