Review comments

Signed-off-by: Aditya Ramani <a_ramani@apple.com>

Author: adityaramani

Sources/Containerization/Image/Unpacker/EXT4Unpacker.swift

@@ -45,24 +45,21 @@ public struct EXT4Unpacker: Unpacker {
             try Task.checkCancellation()
             let content = try await image.getContent(digest: layer.digest)
 
+            let compression: ContainerizationArchive.Filter
             switch layer.mediaType {
             case MediaTypes.imageLayer, MediaTypes.dockerImageLayer:
-                try filesystem.unpack(
-                    source: content.path,
-                    format: .paxRestricted,
-                    compression: .none,
-                    progress: progress
-                )
+                compression = .none
             case MediaTypes.imageLayerGzip, MediaTypes.dockerImageLayerGzip:
-                try filesystem.unpack(
-                    source: content.path,
-                    format: .paxRestricted,
-                    compression: .gzip,
-                    progress: progress
-                )
+                compression = .gzip
             default:
                 throw ContainerizationError(.unsupported, message: "Media type \(layer.mediaType) not supported.")
             }
+            try filesystem.unpack(
+                source: content.path,
+                format: .paxRestricted,
+                compression: compression,
+                progress: progress
+            )
         }
 
         return .block(

Sources/cctl/ImageCommand.swift

@@ -99,7 +99,7 @@ extension Application {
             @Option(name: .customLong("platform"), help: "Platform string in the form 'os/arch/variant'. Example 'linux/arm64/v8', 'linux/amd64'") var platformString: String?
 
             @Option(
-                name: .customLong("unpack-path"), help: "Path to unpack image into",
+                name: .customLong("unpack-path"), help: "Path to a new directory to unpack the image into",
                 transform: { str in
                     URL(fileURLWithPath: str, relativeTo: .currentDirectory()).absoluteURL.path(percentEncoded: false)
                 })
@@ -137,7 +137,7 @@ extension Application {
                     return
                 }
                 guard !FileManager.default.fileExists(atPath: unpackPath) else {
-                    throw ContainerizationError(.invalidArgument, message: "File exists at \(unpackPath)")
+                    throw ContainerizationError(.exists, message: "Directory already exists at \(unpackPath)")
                 }
                 let unpackUrl = URL(filePath: unpackPath)
                 try FileManager.default.createDirectory(at: unpackUrl, withIntermediateDirectories: true)