Option to exclude quick access from results

Author: 01Dri

Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml

@@ -32,6 +32,7 @@
     <system:String x:Key="plugin_explorer_add">Add</system:String>
     <system:String x:Key="plugin_explorer_generalsetting_header">General Setting</system:String>
     <system:String x:Key="plugin_explorer_manageactionkeywords_header">Customise Action Keywords</system:String>
+    <system:String x:Key="plugin_explorer_exclude_quickaccess_from_actionkeywords">Exclude Quick Access results when using action keywords</system:String>
     <system:String x:Key="plugin_explorer_manage_quick_access_links_header">Customise Quick Access</system:String>
     <system:String x:Key="plugin_explorer_quickaccesslinks_header">Quick Access Links</system:String>
     <system:String x:Key="plugin_explorer_everything_setting_header">Everything Setting</system:String>

Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs

@@ -60,7 +60,7 @@ internal async Task<List<Result>> SearchAsync(Query query, CancellationToken tok
 
             if (activeActionKeyword == null && !isPathSearch)
             {
-                MergeQuickAccessInResultsIfQueryMatch(results, query);
+                MergeQuickAccessInResultsIfQueryMatch(results, query, activeActionKeyword);
                 return results.ToList();
             }
 
@@ -105,7 +105,7 @@ when activeActionKeyword.Equals(ActionKeyword.QuickAccessActionKeyword):
             }
 
             // Merge Quick Access Link results for non-path searches.
-            MergeQuickAccessInResultsIfQueryMatch(results, query);
+            MergeQuickAccessInResultsIfQueryMatch(results, query, activeActionKeyword);
             try
             {
                 await foreach (var search in searchResults.WithCancellation(token).ConfigureAwait(false))
@@ -279,8 +279,12 @@ private bool ShouldSkip(ActionKeyword actionKeywordActive, SearchResult search)
             return false;
         }
 
-        private void MergeQuickAccessInResultsIfQueryMatch(HashSet<Result> results, Query query)
+        private void MergeQuickAccessInResultsIfQueryMatch(HashSet<Result> results, Query query, ActionKeyword? activeActionKeyword)
         {
+            if (activeActionKeyword != null && activeActionKeyword != ActionKeyword.QuickAccessActionKeyword)
+            {
+                if (Settings.ExcludeQuickAccessFromActionKeywords) return;
+            }
             var quickAccessMatched = QuickAccess.AccessLinkListMatched(query, Settings.QuickAccessLinks);
             if (quickAccessMatched != null && quickAccessMatched.Any()) results.UnionWith(quickAccessMatched);
         }

Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs

@@ -68,6 +68,8 @@ public class Settings
 
         public bool FileSearchKeywordEnabled { get; set; }
 
+        public bool ExcludeQuickAccessFromActionKeywords { get; set; } = false;
+
         public bool WarnWindowsSearchServiceOff { get; set; } = true;
 
         public bool ShowFileSizeInPreviewPanel { get; set; } = true;

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml

@@ -674,17 +674,27 @@
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
+<Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <Border
+                <CheckBox
                     Grid.Row="0"
                     Grid.Column="0"
                     Grid.ColumnSpan="2"
                     Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+                    HorizontalAlignment="Left"
+                    Content="{DynamicResource plugin_explorer_exclude_quickaccess_from_actionkeywords}"
+                    IsChecked="{Binding Settings.ExcludeQuickAccessFromActionKeywords}" />
+
+                <Border
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Grid.ColumnSpan="2"
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                     HorizontalAlignment="Stretch"
                     BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
                     BorderThickness="1">
@@ -695,7 +705,7 @@
                 </Border>
 
                 <StackPanel
-                    Grid.Row="1"
+                    Grid.Row="2"
                     Grid.Column="0"
                     Grid.ColumnSpan="2"
                     Margin="{StaticResource SettingPanelItemTopBottomMargin}"