Merge pull request #2536 from Flow-Launcher/dev

jjw24 · web-flow · commit b623295b0a6e · 2024-02-05T19:12:18.000+11:00
Release 1.17.1
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
@@ -221,7 +221,6 @@
                                 Visibility="Visible">
                                 <TextBox.CommandBindings>
                                     <CommandBinding Command="ApplicationCommands.Copy" Executed="OnCopy" />
-                                    <CommandBinding Command="ApplicationCommands.Paste" Executed="OnPaste" />
                                 </TextBox.CommandBindings>
                                 <TextBox.ContextMenu>
                                     <ContextMenu MinWidth="160">
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
@@ -25,6 +25,7 @@
 using Key = System.Windows.Input.Key;
 using System.Media;
 using static Flow.Launcher.ViewModel.SettingWindowViewModel;
+using DataObject = System.Windows.DataObject;
 
 namespace Flow.Launcher
 {
@@ -50,7 +51,8 @@ public MainWindow(Settings settings, MainViewModel mainVM)
             _settings = settings;
 
             InitializeComponent();
-            InitializePosition();                        
+            InitializePosition();
+            DataObject.AddPastingHandler(QueryTextBox, OnPaste);
         }
 
         public MainWindow()
@@ -72,12 +74,16 @@ private void OnCopy(object sender, ExecutedRoutedEventArgs e)
             }
         }
 
-        private void OnPaste(object sender, ExecutedRoutedEventArgs e)
+        private void OnPaste(object sender, DataObjectPastingEventArgs e)
         {
-            if (System.Windows.Clipboard.ContainsText())
+            var isText = e.SourceDataObject.GetDataPresent(System.Windows.DataFormats.UnicodeText, true);
+            if (isText)
             {
-                _viewModel.ChangeQueryText(System.Windows.Clipboard.GetText().Replace("\n", String.Empty).Replace("\r", String.Empty));
-                e.Handled = true;
+                var text = e.SourceDataObject.GetData(System.Windows.DataFormats.UnicodeText) as string;
+                text = text.Replace(Environment.NewLine, " ");
+                DataObject data = new DataObject();
+                data.SetData(System.Windows.DataFormats.UnicodeText, text);
+                e.DataObject = data;
             }
         }
         
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -259,6 +259,12 @@ private void AutocompleteQuery()
                 }
                 else if (!string.IsNullOrEmpty(SelectedResults.SelectedItem?.QuerySuggestionText))
                 {
+                    var defaultSuggestion = SelectedResults.SelectedItem.QuerySuggestionText;
+                    // check if result.actionkeywordassigned is empty
+                    if (!string.IsNullOrEmpty(result.ActionKeywordAssigned))
+                    {
+                        autoCompleteText = $"{result.ActionKeywordAssigned} {defaultSuggestion}";
+                    }
                     autoCompleteText = SelectedResults.SelectedItem.QuerySuggestionText;
                 }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/WindowsIndex.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/WindowsIndex.cs
@@ -16,7 +16,7 @@ internal static class WindowsIndex
     {
 
         // Reserved keywords in oleDB
-        private static Regex _reservedPatternMatcher = new(@"[`\@\＠\#\＃\＊\^,\&\＆\/\\\$\%_;\[\]]+", RegexOptions.Compiled);
+        private static Regex _reservedPatternMatcher = new(@"^[`\@\＠\#\＃\＊\^,\&\＆\/\\\$\%_;\[\]]+$", RegexOptions.Compiled);
 
         private static async IAsyncEnumerable<SearchResult> ExecuteWindowsIndexSearchAsync(string indexQueryString, string connectionString, [EnumeratorCancellation] CancellationToken token)
         {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
@@ -10,7 +10,7 @@
   "Name": "Explorer",
   "Description": "Find and manage files and folders via Windows Search or Everything",
   "Author": "Jeremy Wu",
-  "Version": "3.1.4",
+  "Version": "3.1.5",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '1.17.0.{build}'
+version: '1.17.1.{build}'
 
 init:
 - ps: |

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`using Key = System.Windows.Input.Key;`
`26`	`26`	`using System.Media;`
`27`	`27`	`using static Flow.Launcher.ViewModel.SettingWindowViewModel;`
	`28`	`+using DataObject = System.Windows.DataObject;`
`28`	`29`
`29`	`30`	`namespace Flow.Launcher`
`30`	`31`	`{`
`@@ -50,7 +51,8 @@ public MainWindow(Settings settings, MainViewModel mainVM)`
`50`	`51`	`_settings = settings;`
`51`	`52`
`52`	`53`	`InitializeComponent();`
`53`		`- InitializePosition();`
	`54`	`+ InitializePosition();`
	`55`	`+ DataObject.AddPastingHandler(QueryTextBox, OnPaste);`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`public MainWindow()`
`@@ -72,12 +74,16 @@ private void OnCopy(object sender, ExecutedRoutedEventArgs e)`
`72`	`74`	`}`
`73`	`75`	`}`
`74`	`76`
`75`		`- private void OnPaste(object sender, ExecutedRoutedEventArgs e)`
	`77`	`+ private void OnPaste(object sender, DataObjectPastingEventArgs e)`
`76`	`78`	`{`
`77`		`- if (System.Windows.Clipboard.ContainsText())`
	`79`	`+ var isText = e.SourceDataObject.GetDataPresent(System.Windows.DataFormats.UnicodeText, true);`
	`80`	`+ if (isText)`
`78`	`81`	`{`
`79`		`- _viewModel.ChangeQueryText(System.Windows.Clipboard.GetText().Replace("\n", String.Empty).Replace("\r", String.Empty));`
`80`		`- e.Handled = true;`
	`82`	`+ var text = e.SourceDataObject.GetData(System.Windows.DataFormats.UnicodeText) as string;`
	`83`	`+ text = text.Replace(Environment.NewLine, " ");`
	`84`	`+ DataObject data = new DataObject();`
	`85`	`+ data.SetData(System.Windows.DataFormats.UnicodeText, text);`
	`86`	`+ e.DataObject = data;`
`81`	`87`	`}`
`82`	`88`	`}`
`83`	`89`
Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,12 @@ private void AutocompleteQuery()`
`259`	`259`	`}`
`260`	`260`	`else if (!string.IsNullOrEmpty(SelectedResults.SelectedItem?.QuerySuggestionText))`
`261`	`261`	`{`
	`262`	`+ var defaultSuggestion = SelectedResults.SelectedItem.QuerySuggestionText;`
	`263`	`+ // check if result.actionkeywordassigned is empty`
	`264`	`+ if (!string.IsNullOrEmpty(result.ActionKeywordAssigned))`
	`265`	`+ {`
	`266`	`+ autoCompleteText = $"{result.ActionKeywordAssigned} {defaultSuggestion}";`
	`267`	`+ }`
`262`	`268`	`autoCompleteText = SelectedResults.SelectedItem.QuerySuggestionText;`
`263`	`269`	`}`
`264`	`270`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ internal static class WindowsIndex`
`16`	`16`	`{`
`17`	`17`
`18`	`18`	`// Reserved keywords in oleDB`
`19`		- private static Regex _reservedPatternMatcher = new(@"[`\@\＠\#\＃\＊\^,\&\＆\/\\\$\%_;\[\]]+", RegexOptions.Compiled);
	`19`	+ private static Regex _reservedPatternMatcher = new(@"^[`\@\＠\#\＃\＊\^,\&\＆\/\\\$\%_;\[\]]+$", RegexOptions.Compiled);
`20`	`20`
`21`	`21`	`private static async IAsyncEnumerable<SearchResult> ExecuteWindowsIndexSearchAsync(string indexQueryString, string connectionString, [EnumeratorCancellation] CancellationToken token)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: '1.17.0.{build}'`
	`1`	`+version: '1.17.1.{build}'`
`2`	`2`
`3`	`3`	`init:`
`4`	`4`	`- ps: \|`