Filter out null browser

johnste · Aug 18, 2019 · 632689d · 632689d
1 parent f8f25b6
commit 632689d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/Finicky/Finicky/AppDelegate.swift b/Finicky/Finicky/AppDelegate.swift
@@ -132,7 +132,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
                 if let browser = appDescriptor.browsers.first {
                     description += "Browser:\n"
                     description += "    \(browser.name) \(browser.openInBackground ?? false ? "(opens in background)" : "")\n"
-                } else {}
+                }
+            } else if appDescriptor.browsers.count == 0 {
+                description += "Won't open any browser"
             } else {
                 description += "First active browser of:\n"
                 for (index, browser) in appDescriptor.browsers.enumerated() {
@@ -200,11 +202,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
                     logToConsole(description)
                     showNotification(title: "Unable to find application", informativeText: "Finicky was unable to find the application \"" + appToStart.name + "\"", error: true)
                 }
-            } else {
-                let description = "Finicky did not understand what application to start"
-                print(description)
-                logToConsole(description)
-                showNotification(title: description, informativeText: "Finicky was unable to find the application", error: true)
             }
         }
     }

diff --git a/Finicky/Finicky/Config.swift b/Finicky/Finicky/Config.swift
@@ -242,6 +242,11 @@ open class FinickyConfig {
                     let appType = AppDescriptorType(rawValue: dict["appType"] as! String)
                     let openInBackground: Bool? = dict["openInBackground"] as? Bool
                     let browserName = dict["name"] as! String
+
+                    if browserName == "" {
+                        return nil
+                    }
+
                     do {
                         let browser = try BrowserOpts(name: browserName, appType: appType!, openInBackground: openInBackground)
                         return browser

diff --git a/config-api/.finicky.example.js b/config-api/.finicky.example.js
@@ -14,7 +14,11 @@ module.exports = {
       // Open workplace related sites in work browser
       match: [/workplace/],
       browser: [{ name: "Google Chrome Canary", openInBackground: true }, "Safari"]
-
-    }
+    },
+    {
+      // Open workplace related sites in work browser
+      match: [/test/],
+      browser: [null, "Safari"]
+    },
   ]
 };