Stop showing wildcard panes if exact match panes exist

mr-pennyworth · Jul 9, 2024 · 0982ea4 · 0982ea4
1 parent ac9da7f
commit 0982ea4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/AlfredExtraPane/Pane.swift b/AlfredExtraPane/Pane.swift
@@ -36,16 +36,13 @@ class Pane {
 
     Alfred.onHide { self.hide() }
     Alfred.onFrameChange { self.alfredFrame = $0 }
-    Alfred.onItemSelect { item in
-      if (item.workflowuid == self.config.workflowUID)
-          || (item.workflowuid == self.workflowIDtoUID[self.config.workflowUID])
-          || (self.config.workflowUID == "*") {
-        if let url = item.quicklookurl {
-          return self.render(url)
-        }
-      }
-      self.hide()
-    }
+  }
+
+  lazy var isWildcard: Bool = { self.config.workflowUID == "*" }()
+
+  func matchesExactly(item: Alfred.SelectedItem) -> Bool {
+    item.workflowuid == self.config.workflowUID ||
+      item.workflowuid == self.workflowIDtoUID[self.config.workflowUID]
   }
 
   func render(_ url: URL) {

diff --git a/AlfredExtraPane/main.swift b/AlfredExtraPane/main.swift
@@ -22,6 +22,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     let confs: [PaneConfig] =
       (try? read(contentsOf: configFile())) ?? [defaultConfig]
     panes = confs.map { Pane(config: $0) }
+    Alfred.onItemSelect { item in
+      // First, render panes that have exact match with workflowUID.
+      // Then, if no exact match is found, render the wildcard panes.
+      [
+        self.panes.filter({ $0.matchesExactly(item: item) }),
+        self.panes.filter({ $0.isWildcard })
+      ] .first(where: { !$0.isEmpty })?
+        .forEach({ pane in item.quicklookurl.map { pane.render($0) } })
+    }
   }
 
   func applicationDidFinishLaunching(_ notification: Notification) {