mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-09-07 09:55:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

To remove the condition that space is needed after the Action keyword (#6003)

Browse Source 
* Returning individual queries for each plugin

* Changed cancellation token from Query type to directly using the rawQuery

* Changed the way we get the plugins for which we execute the query

* updated UpdateResultView to take a string instead of query

* Changed the way we set a query for each plugin

* removed todo comment

* global plugins are added as a part of the query builder

* Fix for plugin.json of Folder plugin being copied into the shell plugin

* >,< and : are not allowed in file paths and indexer creates a query which searches compares if a file name is greater than or lesser than the query

* Reformatted the regex

* catching the exception

* fixed existing tests

* modified it so that it works with action keyword as well as action keywords

* Added unit tests for non global plugins

* fixed test

* add back whitespace that was removed by mistake

* fix regex

* modified the cold start query

* remove extra condition

* terms being modified as expected

* used key value pairs to iterate through the dictionary

* renamed variable

* added check for an empty dictionary

* remove : because it may appear in the file path

* fix some whitespace warnings that were being treated as errors
This commit is contained in:
Alekhya
2020-08-21 12:21:42 -07:00
committed by GitHub
parent f6b5840e0e
commit 80f8c0399b
4 changed files with 247 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
View File

@@ -29,7 +29,9 @@ namespace PowerLauncher.ViewModel
{
public class MainViewModel : BaseModel, ISavable, IDisposable
{
private static readonly Query _emptyQuery = new Query();
private string _currentQuery;
private static string _emptyQuery = string.Empty;
private static bool _disposed;
private readonly WoxJsonStorage<QueryHistory> _historyItemsStorage;
@@ -43,7 +45,6 @@ namespace PowerLauncher.ViewModel
private readonly Internationalization _translator = InternationalizationManager.Instance;
private readonly System.Diagnostics.Stopwatch _hotkeyTimer = new System.Diagnostics.Stopwatch();
private Query _currentQuery;
private string _queryTextBeforeLeaveResults;
private CancellationTokenSource _updateSource;
@@ -113,7 +114,7 @@ namespace PowerLauncher.ViewModel
() =>
{
PluginManager.UpdatePluginMetadata(e.Results, pair.Metadata, e.Query);
UpdateResultView(e.Results, e.Query, _updateToken);
UpdateResultView(e.Results, e.Query.RawQuery, _updateToken);
}, _updateToken);
};
}
@@ -461,24 +462,32 @@ namespace PowerLauncher.ViewModel
_updateSource = currentUpdateSource;
var currentCancellationToken = _updateSource.Token;
_updateToken = currentCancellationToken;
var queryText = QueryText.Trim();
var query = QueryBuilder.Build(QueryText.Trim(), PluginManager.NonGlobalPlugins);
if (query != null)
var pluginQueryPairs = QueryBuilder.Build(ref queryText, PluginManager.NonGlobalPlugins);
if (pluginQueryPairs != null && pluginQueryPairs.Count > 0)
{
_currentQuery = query;
_currentQuery = queryText;
Task.Run(
() =>
{
Thread.Sleep(20);
var plugins = PluginManager.ValidPluginsForQuery(query);
// Contains all the plugins for which this raw query is valid
var plugins = pluginQueryPairs.Keys.ToList();
try
{
currentCancellationToken.ThrowIfCancellationRequested();
var resultPluginPair = new List<(List<Result>, PluginMetadata)>();
foreach (PluginPair plugin in plugins)
// To execute a query corresponding to each plugin
foreach (KeyValuePair<PluginPair, Query> pluginQueryItem in pluginQueryPairs)
{
var plugin = pluginQueryItem.Key;
var query = pluginQueryItem.Value;
if (!plugin.Metadata.Disabled)
{
var results = PluginManager.QueryForPlugin(plugin, query);
@@ -489,12 +498,12 @@ namespace PowerLauncher.ViewModel
lock (_addResultsLock)
{
if (query.RawQuery == _currentQuery.RawQuery)
if (queryText.Equals(_currentQuery, StringComparison.CurrentCultureIgnoreCase))
{
Results.Clear();
foreach (var p in resultPluginPair)
{
UpdateResultView(p.Item1, query, currentCancellationToken);
UpdateResultView(p.Item1, queryText, currentCancellationToken);
currentCancellationToken.ThrowIfCancellationRequested();
}
@@ -504,7 +513,8 @@ namespace PowerLauncher.ViewModel
}
currentCancellationToken.ThrowIfCancellationRequested();
UpdateResultsListViewAfterQuery(query);
UpdateResultsListViewAfterQuery(queryText);
// Run the slower query of the DelayedExecution plugins
currentCancellationToken.ThrowIfCancellationRequested();
@@ -514,13 +524,16 @@ namespace PowerLauncher.ViewModel
{
if (!plugin.Metadata.Disabled)
{
Query query;
pluginQueryPairs.TryGetValue(plugin, out query);
var results = PluginManager.QueryForPlugin(plugin, query, true);
currentCancellationToken.ThrowIfCancellationRequested();
if ((results?.Count ?? 0) != 0)
{
lock (_addResultsLock)
{
if (query.RawQuery == _currentQuery.RawQuery)
if (queryText.Equals(_currentQuery, StringComparison.CurrentCultureIgnoreCase))
{
currentCancellationToken.ThrowIfCancellationRequested();
@@ -529,14 +542,15 @@ namespace PowerLauncher.ViewModel
currentCancellationToken.ThrowIfCancellationRequested();
// Add the new results from the plugin
UpdateResultView(results, query, currentCancellationToken);
UpdateResultView(results, queryText, currentCancellationToken);
currentCancellationToken.ThrowIfCancellationRequested();
Results.Sort();
}
}
currentCancellationToken.ThrowIfCancellationRequested();
UpdateResultsListViewAfterQuery(query, true);
UpdateResultsListViewAfterQuery(queryText, true);
}
}
}
@@ -556,7 +570,7 @@ namespace PowerLauncher.ViewModel
{
QueryTimeMs = queryTimer.ElapsedMilliseconds,
NumResults = Results.Results.Count,
QueryLength = query.RawQuery.Length,
QueryLength = queryText.Length,
};
PowerToysTelemetry.Log.WriteEvent(queryEvent);
}, currentCancellationToken);
@@ -572,11 +586,11 @@ namespace PowerLauncher.ViewModel
}
}
private void UpdateResultsListViewAfterQuery(Query query, bool isDelayedInvoke = false)
private void UpdateResultsListViewAfterQuery(string queryText, bool isDelayedInvoke = false)
{
Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{
if (query.RawQuery == _currentQuery.RawQuery)
if (queryText.Equals(_currentQuery, StringComparison.CurrentCultureIgnoreCase))
{
Results.Results.NotifyChanges();
}
@@ -740,7 +754,7 @@ namespace PowerLauncher.ViewModel
/// <summary>
/// To avoid deadlock, this method should not called from main thread
/// </summary>
public void UpdateResultView(List<Result> list, Query originQuery, CancellationToken ct)
public void UpdateResultView(List<Result> list, string originQuery, CancellationToken ct)
{
if (list == null)
{
@@ -764,7 +778,7 @@ namespace PowerLauncher.ViewModel
}
}
if (originQuery.RawQuery == _currentQuery.RawQuery)
if (originQuery.Equals(_currentQuery, StringComparison.CurrentCultureIgnoreCase))
{
ct.ThrowIfCancellationRequested();
Results.AddResults(list, ct);
@@ -786,10 +800,14 @@ namespace PowerLauncher.ViewModel
// Fix Cold start for plugins
string s = "m";
var query = QueryBuilder.Build(s.Trim(), PluginManager.NonGlobalPlugins);
var plugins = PluginManager.ValidPluginsForQuery(query);
foreach (PluginPair plugin in plugins)
var pluginQueryPairs = QueryBuilder.Build(ref s, PluginManager.NonGlobalPlugins);
// To execute a query corresponding to each plugin
foreach (KeyValuePair<PluginPair, Query> pluginQueryItem in pluginQueryPairs)
{
var plugin = pluginQueryItem.Key;
var query = pluginQueryItem.Value;
if (!plugin.Metadata.Disabled && plugin.Metadata.Name != "Window Walker")
{
_ = PluginManager.QueryForPlugin(plugin, query);