updated levels and added keys arguments functionality

Author: scriptingosx

Sources/prefs/Preferences.swift

@@ -16,55 +16,55 @@ struct Preferences {
 
   let suiteName: String
   let userDefaults: UserDefaults
-
-
+  
+  
   var allKeys: [String] {
     userDefaults.dictionaryRepresentation().map { $0.key }
   }
 
-  var systemGlobalKeys: [String] {
+  var networkGlobalKeys: [String] {
     keylist(kCFPreferencesAnyApplication, kCFPreferencesAnyUser, kCFPreferencesAnyHost)
   }
-
-  var systemHostGlobalKeys: [String] {
+  
+  var systemGlobalKeys: [String] {
     keylist(kCFPreferencesAnyApplication, kCFPreferencesAnyUser, kCFPreferencesCurrentHost)
   }
-
+  
   var hostGlobalKeys: [String] {
-   keylist(kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)
+    keylist(kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)
   }
-
+  
   var userGlobalKeys: [String] {
     keylist(kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)
   }
-
+  
   var globalKeys: [String] {
     var globalKeys = Set(userGlobalKeys)
-    globalKeys.formUnion(systemGlobalKeys)
+    globalKeys.formUnion(networkGlobalKeys)
     globalKeys.formUnion(hostGlobalKeys)
     return Array(globalKeys)
   }
-
+  
   var managedKeys: [String] {
     allKeys.filter { userDefaults.objectIsForced(forKey: $0) }
   }
-
+  
   var userKeys: [String] {
     keylist(suiteName as CFString, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)
   }
-
-  var systemKeys: [String] {
+  
+  var networkKeys: [String] {
     keylist(suiteName as CFString, kCFPreferencesAnyUser, kCFPreferencesAnyHost)
   }
-
-  var systemHostKeys: [String] {
-   keylist(suiteName as CFString, kCFPreferencesAnyUser, kCFPreferencesCurrentHost)
+  
+  var systemKeys: [String] {
+    keylist(suiteName as CFString, kCFPreferencesAnyUser, kCFPreferencesCurrentHost)
   }
-
+  
   var hostKeys: [String] {
     keylist(suiteName as CFString, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost)
   }
-
+  
   var volatileKeys: [String] {
     let vDomains = userDefaults.volatileDomainNames
     var volatileKeys = Set<String>()
@@ -75,17 +75,17 @@ struct Preferences {
     }
     return Array(volatileKeys)
   }
-
+  
   // MARK: functions
-
+  
   func keylist(_ applicationID: CFString, _ userName: CFString, _ hostName: CFString) -> [String] {
     CFPreferencesCopyKeyList(applicationID, userName, hostName) as? [String] ?? []
   }
-
+  
   func isManaged(_ key: String) -> Bool {
     userDefaults.objectIsForced(forKey: key)
   }
-
+  
   func level(for key: String) -> String? {
     if !allKeys.contains(where: {$0 == key}) {
       return nil
@@ -111,16 +111,16 @@ struct Preferences {
     if systemGlobalKeys.contains(where: {$0 == key}) {
       return "global/system"
     }
-    if systemHostGlobalKeys.contains(where: {$0 == key}) {
-      return "global/system/host"
+    if networkKeys.contains(where: {$0 == key}) {
+      return "network"
     }
-    if systemHostKeys.contains(where: {$0 == key}) {
-      return "system/host/app"
+    if networkGlobalKeys.contains(where: {$0 == key}) {
+      return "global/network"
     }
     if volatileKeys.contains(where: {$0 == key}) {
       return "volatile"
     }
-
+    
     return nil
   }
 }

Sources/prefs/Prefs.swift

@@ -13,27 +13,25 @@ struct Prefs: ParsableCommand {
   static var configuration = CommandConfiguration(
     commandName: "prefs",
     abstract: "Shows preference/defaults settings from all levels together with their level",
+    usage: """
+prefs <domain>
+prefs <domain> [<keys> ...]
+""",
     version: "0.1"
   )
 
 
   // MARK: arguments  and flags
 
-  @Argument(help: "the app identifier or preference domain")
-  var applicationID: String
-
-  @Argument(help: "preference keys to show. When no key is given all values will be shown")
-  var keys: [String] = []
-
   @Flag(
     name: [.customShort("g"), .customLong("globals")],
-    help: "show values from GlobalPreferences files as well"
+    help: "show values from GlobalPreferences files"
   )
   var showGlobals = false
 
   @Flag(
     name: [.customLong("volatiles")],
-    help: "show values from GlobalPreferences files as well"
+    help: "show values from volatile domains"
   )
   var showVolatiles = false
 
@@ -43,20 +41,49 @@ struct Prefs: ParsableCommand {
   )
   var showOnlyValue = false
 
+  @Argument(
+    help: ArgumentHelp(
+      "the app identifier or preference domain",
+      valueName: "domain"
+    )
+  )
+  var applicationID: String
+
+  @Argument(help: "preference keys to show. When no key is given all values will be shown")
+  var keys: [String] = []
+
+
   // MARK: functions
   func exit(_ message: Any, code: Int32) throws -> Never {
     print(message)
     throw ExitCode(code)
   }
 
+  func printDetail(_ key: String, preferences: Preferences) {
+    guard let value = preferences.userDefaults.object(forKey: key) else { return }
+    let level = preferences.level(for: key) ?? "unknown"
+    if showOnlyValue {
+      print(value)
+    } else {
+      print("\(key) [\(level)]: \(value)")
+    }
+  }
+
 
   // MARK: run
   func run() throws {
     guard let preferences = Preferences(suiteName: applicationID)
     else {
       try exit("cannot get defaults for '\(applicationID)'", code: 11)
     }
-    
+
+    if keys.count > 0 {
+      for key in keys {
+        printDetail(key, preferences: preferences)
+      }
+      return
+    }
+
     // cache these for performance
     let globalKeys = preferences.globalKeys
     //let volatileKeys = preferences.volatileKeys
@@ -70,10 +97,7 @@ struct Prefs: ParsableCommand {
         continue
       }
 
-      guard let value = preferences.userDefaults.object(forKey: key) else { continue }
-
-      let level = preferences.level(for: key) ?? "unknown"
-      print("\(key) [\(level)]: \(value)")
+      printDetail(key, preferences: preferences)
     }
   }
 }