Merge pull request #657 from multiplex55/codex/update-macro-step-selection-for-bookmarks-and-folders

Use list queries for folders/bookmarks in macro step selection

Author: multiplex55

src/gui/macro_dialog.rs

@@ -326,9 +326,9 @@ impl MacroDialog {
                 {
                     let filter = self.add_filter.trim().to_lowercase();
                     let mut actions = if plugin.name() == "folders" {
-                        plugin.search(&format!("f {}", self.add_filter))
+                        plugin.search(&format!("f list {}", self.add_filter))
                     } else if plugin.name() == "bookmarks" {
-                        plugin.search(&format!("bm {}", self.add_filter))
+                        plugin.search(&format!("bm list {}", self.add_filter))
                     } else {
                         plugin.commands()
                     };

src/plugins/folders.rs

@@ -163,6 +163,33 @@ impl FoldersPlugin {
             watcher,
         }
     }
+
+    fn list_entries(&self, filter: &str) -> Vec<Action> {
+        let guard = match self.data.lock() {
+            Ok(g) => g,
+            Err(_) => return Vec::new(),
+        };
+        guard
+            .iter()
+            .filter(|f| {
+                self.matcher.fuzzy_match(&f.label, filter).is_some()
+                    || self.matcher.fuzzy_match(&f.path, filter).is_some()
+                    || f.alias
+                        .as_ref()
+                        .map(|a| self.matcher.fuzzy_match(a, filter).is_some())
+                        .unwrap_or(false)
+            })
+            .map(|f| {
+                let label = f.alias.clone().unwrap_or_else(|| f.label.clone());
+                Action {
+                    label,
+                    desc: f.path.clone(),
+                    action: f.path.clone(),
+                    args: None,
+                }
+            })
+            .collect()
+    }
 }
 
 impl Default for FoldersPlugin {
@@ -212,36 +239,18 @@ impl Plugin for FoldersPlugin {
                 .collect();
         }
 
+        const LIST_PREFIX: &str = "f list";
+        if let Some(rest) = crate::common::strip_prefix_ci(query, LIST_PREFIX) {
+            return self.list_entries(rest.trim());
+        }
+
         const PREFIX: &str = "f";
         let rest = match crate::common::strip_prefix_ci(query, PREFIX) {
             Some(r) => r,
             None => return Vec::new(),
         };
         let filter = rest.trim();
-        let guard = match self.data.lock() {
-            Ok(g) => g,
-            Err(_) => return Vec::new(),
-        };
-        guard
-            .iter()
-            .filter(|f| {
-                self.matcher.fuzzy_match(&f.label, filter).is_some()
-                    || self.matcher.fuzzy_match(&f.path, filter).is_some()
-                    || f.alias
-                        .as_ref()
-                        .map(|a| self.matcher.fuzzy_match(a, filter).is_some())
-                        .unwrap_or(false)
-            })
-            .map(|f| {
-                let label = f.alias.clone().unwrap_or_else(|| f.label.clone());
-                Action {
-                    label,
-                    desc: f.path.clone(),
-                    action: f.path.clone(),
-                    args: None,
-                }
-            })
-            .collect()
+        self.list_entries(filter)
     }
 
     fn name(&self) -> &str {
@@ -264,6 +273,12 @@ impl Plugin for FoldersPlugin {
                 action: "query:f ".into(),
                 args: None,
             },
+            Action {
+                label: "f list".into(),
+                desc: "Folder".into(),
+                action: "query:f list ".into(),
+                args: None,
+            },
             Action {
                 label: "f add".into(),
                 desc: "Folder".into(),