add global progress flag

Author: saehejkang

Sources/ContainerClient/Flags.swift

@@ -200,4 +200,16 @@ public struct Flags {
         )
         public var virtualization: Bool = false
     }
+    
+    public struct Progress: ParsableArguments {
+        public init() {}
+        
+        public enum ProgressType: String, ExpressibleByArgument {
+            case none
+            case ansi
+        }
+
+        @Option(name: .long, help: ArgumentHelp("Progress type (format: none|ansi)", valueName: "type"))
+        public var progress: ProgressType = .ansi
+    }
 }

Sources/ContainerCommands/Container/ContainerRun.swift

@@ -43,9 +43,9 @@ extension Application {
 
         @OptionGroup(title: "Registry options")
         var registryFlags: Flags.Registry
-
-        @Option(name: .long, help: ArgumentHelp("Progress type (format: none|ansi)", valueName: "type"))
-        var progress: String = "ansi"
+        
+        @OptionGroup
+        var progress: Flags.Progress
 
         @OptionGroup
         var global: Flags.Global
@@ -61,17 +61,15 @@ extension Application {
             let id = Utility.createContainerID(name: self.managementFlags.name)
 
             var progressConfig: ProgressConfig
-            switch self.progress {
-            case "none": progressConfig = try ProgressConfig(disableProgressUpdates: true)
-            case "ansi":
+            switch self.progress.progress {
+            case .none: progressConfig = try ProgressConfig(disableProgressUpdates: true)
+            case .ansi:
                 progressConfig = try ProgressConfig(
                     showTasks: true,
                     showItems: true,
                     ignoreSmallSize: true,
                     totalTasks: 6
                 )
-            default:
-                throw ContainerizationError(.invalidArgument, message: "invalid progress mode \(self.progress)")
             }
 
             let progress = ProgressBar(config: progressConfig)

Sources/ContainerCommands/Image/ImagePull.swift

@@ -34,8 +34,8 @@ extension Application {
         @OptionGroup
         var registry: Flags.Registry
 
-        @Option(name: .long, help: ArgumentHelp("Progress type (format: none|ansi)", valueName: "type"))
-        var progress: String = "ansi"
+        @OptionGroup
+        var progress: Flags.Progress
 
         @Option(
             name: .shortAndLong,
@@ -79,17 +79,15 @@ extension Application {
             let processedReference = try ClientImage.normalizeReference(reference)
 
             var progressConfig: ProgressConfig
-            switch self.progress {
-            case "none": progressConfig = try ProgressConfig(disableProgressUpdates: true)
-            case "ansi":
+            switch self.progress.progress {
+            case .none: progressConfig = try ProgressConfig(disableProgressUpdates: true)
+            case .ansi:
                 progressConfig = try ProgressConfig(
                     showTasks: true,
                     showItems: true,
                     ignoreSmallSize: true,
                     totalTasks: 2
                 )
-            default:
-                throw ContainerizationError(.invalidArgument, message: "invalid progress mode \(self.progress)")
             }
 
             let progress = ProgressBar(config: progressConfig)

Sources/ContainerCommands/Image/ImagePush.swift

@@ -31,8 +31,8 @@ extension Application {
         @OptionGroup
         var registry: Flags.Registry
 
-        @Option(name: .long, help: ArgumentHelp("Progress type (format: none|ansi)", valueName: "type"))
-        var progress: String = "ansi"
+        @OptionGroup
+        var progress: Flags.Progress
 
         @Option(
             name: [.customLong("arch"), .customShort("a")],
@@ -69,18 +69,16 @@ extension Application {
             let image = try await ClientImage.get(reference: reference)
 
             var progressConfig: ProgressConfig
-            switch self.progress {
-            case "none": progressConfig = try ProgressConfig(disableProgressUpdates: true)
-            case "ansi":
+            switch self.progress.progress {
+            case .none: progressConfig = try ProgressConfig(disableProgressUpdates: true)
+            case .ansi:
                 progressConfig = try ProgressConfig(
                     description: "Pushing image \(image.reference)",
                     itemsName: "blobs",
                     showItems: true,
                     showSpeed: false,
                     ignoreSmallSize: true
                 )
-            default:
-                throw ContainerizationError(.invalidArgument, message: "invalid progress mode \(self.progress)")
             }
 
             let progress = ProgressBar(config: progressConfig)