some code cleanup

Author: scriptingosx

Sources/utiluti/AppCommands.swift

@@ -14,7 +14,10 @@ struct AppCommands: ParsableCommand {
   static let configuration = CommandConfiguration(
     commandName: "app",
     abstract: "list uniform types identifiers and url schemes associated with an app",
-    subcommands: [ Types.self, Schemes.self ]
+    subcommands: [
+      Types.self,
+      Schemes.self
+    ]
   )
 
   struct Types: ParsableCommand {

Sources/utiluti/GetUTI.swift

@@ -9,7 +9,6 @@ import Foundation
 import ArgumentParser
 import UniformTypeIdentifiers
 
-@available(macOS 11.0, *)
 struct GetUTI: ParsableCommand {
   static let configuration
   = CommandConfiguration(abstract: "Get the type identifier (UTI) for a file extension")

Sources/utiluti/TypeCommands.swift

@@ -10,19 +10,17 @@ import ArgumentParser
 import UniformTypeIdentifiers
 
 struct TypeCommands: ParsableCommand {
-  
-  static var subCommands: [ParsableCommand.Type] {
-    if #available(macOS 11.0, *) {
-      return [Get.self, List.self, Set.self, Info.self, FileExtensions.self]
-    } else {
-      return[Get.self, List.self, Set.self]
-    }
-  }
-  
+
   static let configuration = CommandConfiguration(
     commandName: "type",
     abstract: "Manipulate default file type handlers",
-    subcommands: subCommands,
+    subcommands: [
+      Get.self,
+      List.self,
+      Set.self,
+      Info.self,
+      FileExtensions.self
+    ],
     defaultSubcommand: Get.self
   )
 
@@ -106,7 +104,6 @@ struct TypeCommands: ParsableCommand {
     }
   }
 
-  @available(macOS 11.0, *)
   struct FileExtensions: ParsableCommand {
     static let configuration
     = CommandConfiguration(abstract: "prints the file extensions for the given type identifier")
@@ -124,7 +121,6 @@ struct TypeCommands: ParsableCommand {
     }
   }
 
-  @available(macOS 11.0, *)
   struct Info: ParsableCommand {
     static let configuration
     = CommandConfiguration(abstract: "prints information for the given type identifier")

Sources/utiluti/URLScheme.swift renamed to Sources/utiluti/URLCommands.swift

@@ -12,13 +12,21 @@ struct URLCommands: ParsableCommand {
   static let configuration = CommandConfiguration(
     commandName: "url",
     abstract: "Manipulate default URL scheme handlers",
-    subcommands: [ Get.self, List.self, Set.self],
-    defaultSubcommand: Get.self)
+    subcommands: [
+      Get.self,
+      List.self,
+      Set.self
+    ],
+    defaultSubcommand: Get.self
+  )
 
   struct URLScheme: ParsableArguments {
-    @Argument(help: ArgumentHelp(
-      "the url scheme, e.g. 'http' or 'mailto'",
-      valueName: "scheme"))
+    @Argument(
+      help: ArgumentHelp(
+        "the url scheme, e.g. 'http' or 'mailto'",
+        valueName: "scheme"
+      )
+    )
     var value: String
   }
 

Sources/utiluti/utiluti.swift

@@ -6,12 +6,16 @@ import ArgumentParser
 
 @main
 struct UtilUTI: AsyncParsableCommand {
-  static let subCommands: [ParsableCommand.Type] = [URLCommands.self, TypeCommands.self, GetUTI.self, AppCommands.self, FileCommands.self]
-  
   static let configuration = CommandConfiguration(
     commandName: "utiluti",
     abstract: "Read and set default URL scheme and file type handlers.",
     version: "1.1dev",
-    subcommands: subCommands
+    subcommands: [
+      URLCommands.self,
+      TypeCommands.self,
+      GetUTI.self,
+      AppCommands.self,
+      FileCommands.self
+    ]
   )
 }