Deprecate RawQuery add OriginalQuery

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Flow.Launcher.Plugin;
 
@@ -14,7 +14,7 @@ public static Query Build(string input, string text, Dictionary<string, PluginPa
                 return new Query()
                 {
                     Search = string.Empty,
-                    Input = string.Empty,
+                    OriginalQuery = string.Empty,
                     RawQuery = string.Empty,
                     SearchTerms = Array.Empty<string>(),
                     ActionKeyword = string.Empty,
@@ -53,7 +53,7 @@ public static Query Build(string input, string text, Dictionary<string, PluginPa
             return new Query()
             {
                 Search = search,
-                Input = input,
+                OriginalQuery = input,
                 RawQuery = rawQuery,
                 SearchTerms = searchTerms,
                 ActionKeyword = actionKeyword,

Flow.Launcher.Plugin/Query.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using System;
+using System.Text.Json.Serialization;
 
 namespace Flow.Launcher.Plugin
 {
@@ -8,17 +9,29 @@
     public class Query
     {
         /// <summary>
-        /// Input text in query box.
+        /// Original query, exactly how the user has typed into the search box.
         /// We don't recommend using this property directly. You should always use Search property.
         /// </summary>
-        public string Input { get; internal init; }
+        public string OriginalQuery { get; internal init; }
 
         /// <summary>
         /// Raw query, this includes action keyword if it has.
         /// It has handled buildin custom query shortkeys and build-in shortcuts, and it trims the whitespace.
         /// We don't recommend using this property directly. You should always use Search property.
         /// </summary>
-        public string RawQuery { get; internal init; }
+        [Obsolete("RawQuery is renamed to TrimmedQUery. This property will be removed. Update the code to use TrimmedQuery instead.")]
+        public string RawQuery {
+            get { return TrimmedQuery; }
+            internal init { TrimmedQuery = value; }
+        }
+
+        /// <summary>
+        /// Original query but with trimmed whitespace. Includes action keyword.
+        /// It has handled buildin custom query shortkeys and build-in shortcuts.
+        /// If after exact original query from the search box, should use OriginalQuery property instead.
+        /// We don't recommend using this property directly. You should always use Search property.
+        /// </summary>
+        public string TrimmedQuery { get; internal init; }
 
         /// <summary>
         /// Determines whether the query was forced to execute again.
@@ -47,12 +60,12 @@
         public string[] SearchTerms { get; init; }
 
         /// <summary>
         /// Query can be splited into multiple terms by whitespace
         /// </summary>
         public const string TermSeparator = " ";
 
         /// <summary>
         /// User can set multiple action keywords seperated by whitespace
         /// </summary>
         public const string ActionKeywordSeparator = TermSeparator;
 
@@ -109,6 +122,6 @@
         }
 
         /// <inheritdoc />
         public override string ToString() => RawQuery;
     }
 }

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
@@ -24,7 +24,7 @@
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Storage;
 using iNKORE.UI.WPF.Modern;
 using Microsoft.VisualStudio.Threading;
 
 namespace Flow.Launcher.ViewModel
@@ -271,7 +271,7 @@
 #if DEBUG
                 throw t.Exception;
 #else
                 App.API.LogError(ClassName, $"Error happen in task dealing with viewupdate for results. {t.Exception}");
                 _resultsViewUpdateTask =
                     Task.Run(UpdateActionAsync).ContinueWith(continueAction, CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted, TaskScheduler.Default);
 #endif
@@ -284,7 +284,7 @@
 
             plugin.ResultsUpdated += (s, e) =>
             {
-                if (_updateQuery == null || e.Query.Input != _updateQuery.Input || e.Token.IsCancellationRequested)
+                if (_updateQuery == null || e.Query.OriginalQuery != _updateQuery.OriginalQuery || e.Token.IsCancellationRequested)
                 {
                     return;
                 }
@@ -1470,7 +1470,7 @@
                 _ = Task.Delay(200, currentCancellationToken).ContinueWith(_ =>
                 {
                     // start the progress bar if query takes more than 200 ms and this is the current running query and it didn't finish yet
-                    if (_progressQuery != null && _progressQuery.Input == query.Input)
+                    if (_progressQuery != null && _progressQuery.OriginalQuery == query.OriginalQuery)
                     {
                         ProgressBarVisibility = Visibility.Visible;
                     }