Output to a new folder (#6)

Author: lordcodes

Sources/ImageCramCLI/CommandLineError.swift

@@ -22,7 +22,7 @@ extension CommandLineError: CustomStringConvertible {
         case .apiKeyFileInvalid:
             return "API key file is missing, please try re-running, then updating ImageCram and then reporting the issue on GitHub if it persists."
         case let .failedToMoveFile(from, to):
-            return "Failed to remove file from \(from) to \(to)"
+            return "Failed to move file from \(from) to \(to)"
         case let .invalidInputFile(path):
             return "Cannot read input file at \(path)"
         case let .invalidOutput(path):

Sources/ImageCramCLI/FileMover.swift

@@ -23,9 +23,11 @@ struct FileMover {
         guard let outputPath = outputPath else {
             return inputFile.url
         }
-        guard let outputFolder = try? Folder(path: outputPath) else {
-            return URL(fileURLWithPath: outputPath)
+        let outputUrl = URL(fileURLWithPath: outputPath)
+        if outputUrl.pathExtension.isEmpty {
+            try FileManager.default.createDirectory(at: outputUrl, withIntermediateDirectories: true, attributes: [:])
+            return outputUrl.appendingPathComponent(inputFile.name)
         }
-        return URL(fileURLWithPath: outputFolder.path + "/" + inputFile.name)
+        return outputUrl
     }
 }

Sources/ImageCramTasks/Shell.swift

@@ -9,11 +9,10 @@ struct ShellError: Error, CustomStringConvertible {
     }
 }
 
-func runShell(_ command: String, with arguments: [String] = [], continueOnError: Bool = false) throws {
+func runShell(_ command: String, continueOnError: Bool = false) throws {
     do {
         try shellOut(
             to: command,
-            arguments: arguments,
             outputHandle: .standardOutput,
             errorHandle: .standardError
         )