Merge pull request #84 from johnsonea/add-quality

add an image quality switch

Author: mczachurski

README.md

@@ -70,6 +70,7 @@ Command options are:
  -o            output file name (default is 'output.heic')
  -i            input .json file with wallpaper description
  -e            input .heic file to extract metadata
+ -q            quality of the output images (default is 1.0)
 ```
 
 That's all. Now you can build your own dynamic wallpapers.

Sources/Wallpapper/OptionType.swift

@@ -12,6 +12,7 @@ enum OptionType: String {
     case input = "-i"
     case output = "-o"
     case extract = "-e"
+    case quality = "-q"
     case unknown
 
     init(value: String) {
@@ -21,6 +22,7 @@ enum OptionType: String {
         case "-i": self = .input
         case "-o": self = .output
         case "-e": self = .extract
+        case "-q": self = .quality
         default: self = .unknown
         }
     }

Sources/Wallpapper/Program.swift

@@ -13,6 +13,7 @@ class Program {
     var inputFileName = ""
     var outputFileName: String? = nil
     var shouldExtract = false
+    var quality: Double = 1.0
 
     func run() -> Bool {
 
@@ -88,7 +89,7 @@ class Program {
             let baseURL = fileURL.deletingLastPathComponent()
             let wallpaperGenerator = WallpaperGenerator()
             let fileName = self.outputFileName ?? "output.heic"
-            try wallpaperGenerator.generate(pictureInfos: pictureInfos, baseURL: baseURL, outputFileName: fileName);
+            try wallpaperGenerator.generate(pictureInfos: pictureInfos, baseURL: baseURL, outputFileName: fileName, quality: self.quality);
         } catch (let error as WallpapperError) {
             self.consoleIO.writeMessage("Unexpected error occurs: \(error.message)", to: .error)
             return false
@@ -162,6 +163,18 @@ class Program {
                 optionIndex = inputNameOptionIndex
 
                 self.shouldExtract = true
+            case .quality:
+                let inputNameOptionIndex = optionIndex + 1
+                if inputNameOptionIndex < CommandLine.arguments.count {
+                    if let value = Double(CommandLine.arguments[inputNameOptionIndex]) {
+                        quality = value
+                    } else {
+                        self.consoleIO.writeMessage("invalid quality number", to: .error)
+                        return (true, false)
+                    }
+                }
+
+                optionIndex = inputNameOptionIndex
             default:
                 break;
             }
@@ -192,5 +205,6 @@ class Program {
         self.consoleIO.writeMessage(" -o\t\t\toutput file name (default is 'output.heic')")
         self.consoleIO.writeMessage(" -i\t\t\tinput .json file with wallpaper description")
         self.consoleIO.writeMessage(" -e\t\t\tinput .heic file to extract metadata")
+        self.consoleIO.writeMessage(" -q\t\t\tquality (default = 1.0)")
     }
 }

Sources/WallpapperLib/DynamicWallpaperGenerator/WallpaperGenerator.swift

@@ -13,9 +13,9 @@ public class WallpaperGenerator {
     public init() {
     }
 
-    public func generate(pictureInfos: [PictureInfo], baseURL: URL, outputFileName: String) throws {
+    public func generate(pictureInfos: [PictureInfo], baseURL: URL, outputFileName: String, quality: Double) throws {
         let consoleIO = ConsoleIO()
-        let options = [kCGImageDestinationLossyCompressionQuality: 1.0]
+        let options = [kCGImageDestinationLossyCompressionQuality: quality]
 
         if #available(OSX 10.13, *) {