Refactor for cleaner use of constants #274

swiftbar · Feb 4, 2022 · 7c517e0 · 7c517e0
1 parent b35957d
commit 7c517e0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/SwiftBar/AppDelegate.swift b/SwiftBar/AppDelegate.swift
@@ -152,17 +152,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, SPUStandardUserDriverDelegat
     func userNotificationCenter(_: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
         let payload = response.notification.request.content.userInfo
 
-        guard let pluginID = payload[SystemNotificationName.pluginID.rawValue] as? String,
+        guard let pluginID = payload[SystemNotificationName.pluginID] as? String,
               let plugin = pluginManager.plugins.first(where: { $0.id == pluginID }),
               plugin.enabled else { return }
 
-        if let urlString = payload[SystemNotificationName.url.rawValue] as? String,
+        if let urlString = payload[SystemNotificationName.url] as? String,
            let url = URL(string: urlString)
         {
             NSWorkspace.shared.open(url)
         }
 
-        if let commandString = payload[SystemNotificationName.command.rawValue] as? String,
+        if let commandString = payload[SystemNotificationName.command] as? String,
            let json = commandString.data(using: .utf8), let params = MenuLineParameters(json: json),
            let bash = params.bash
         {

diff --git a/SwiftBar/Plugin/PluginManger.swift b/SwiftBar/Plugin/PluginManger.swift
@@ -273,16 +273,16 @@ extension PluginManager {
         content.sound = silent ? nil : .default
         content.threadIdentifier = pluginID
 
-        content.userInfo[SystemNotificationName.pluginID.rawValue] = pluginID
+        content.userInfo[SystemNotificationName.pluginID] = pluginID
 
         if let urlString = href,
            let url = URL(string: urlString), url.host != nil, url.scheme != nil
         {
-            content.userInfo[SystemNotificationName.url.rawValue] = urlString
+            content.userInfo[SystemNotificationName.url] = urlString
         }
 
         if let commandParams = commandParams {
-            content.userInfo[SystemNotificationName.command.rawValue] = commandParams
+            content.userInfo[SystemNotificationName.command] = commandParams
         }
 
         let uuidString = UUID().uuidString

diff --git a/SwiftBar/Utility/SystemNotificationName.swift b/SwiftBar/Utility/SystemNotificationName.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-enum SystemNotificationName: String {
-    case url
-    case command
-    case pluginID
+struct SystemNotificationName {
+    public static let url = "url"
+    public static let command = "command"
+    public static let pluginID = "pluginID"
 }