rewrite hardcoded arguments

Author: maximtop

Package.resolved

@@ -9,6 +9,15 @@
           "revision": "4356ec54e073741449640d3d50a1fd24fd1e1b8b",
           "version": "2.1.0"
         }
+      },
+      {
+        "package": "swift-argument-parser",
+        "repositoryURL": "https://github.com/apple/swift-argument-parser",
+        "state": {
+          "branch": null,
+          "revision": "83b23d940471b313427da226196661856f6ba3e0",
+          "version": "0.4.4"
+        }
       }
     ]
   },

Package.swift

@@ -19,13 +19,14 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
         .package(url: "https://github.com/gumob/PunycodeSwift.git", from: "2.0.0"),
+        .package(url: "https://github.com/apple/swift-argument-parser", from: "0.4.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "CommandLineWrapper",
-            dependencies: ["ContentBlockerConverter", "Shared"]),
+            dependencies: ["ContentBlockerConverter", "Shared", "ArgumentParser"]),
         .target(
             name: "ContentBlockerConverter",
             dependencies: ["Punnycode", "Shared"]),

README.md

@@ -38,17 +38,17 @@ The result contains following properties:
 - advancedBlocking: json string of advanced blocking rules
 
 ### How to use converter from command line:
-
 ```
-    ./ConverterTool -safariVersion=14 -optimize=true -advancedBlocking=false <<STDIN -o other --options
-    test_rule_one
-    test_rule_two
-    STDIN
+    ConverterTool [--safari-version <safari-version>] [--optimize <optimize>] [--advanced-blocking <advanced-blocking>] [<rules>]
+```
+e.g.
+```
+    cat rules.txt | ./ConverterTool --safari-version 13 --optimize false --advanced-blocking false
 ```
 
 The tool then reads stdin line by line for rule until an empty line.
 
-### How to release on Github
+### How to release on GitHub
 
 Push a new tag in `v*.*.*` format, then provided github action is intended to build and publish new release with an asset binary.
 

Sources/CommandLineWrapper/main.swift

@@ -1,95 +1,93 @@
 import Foundation
 import ContentBlockerConverter
 import Shared
-
-/**
- * Command line wrapper
- * Usage:
- * ./CommandLineWrapper -safariVersion=14 -optimize=true -advancedBlocking=false
- */
+import ArgumentParser
 
 func writeToStdError(str: String) {
-    let handle = FileHandle.standardError;
-    
+    let handle = FileHandle.standardError
+
     if let data = str.data(using: String.Encoding.utf8, allowLossyConversion: false) {
         handle.write(data)
     }
 }
 
 func writeToStdOut(str: String) {
-    let handle = FileHandle.standardOutput;
-    
+    let handle = FileHandle.standardOutput
+
     if let data = str.data(using: String.Encoding.utf8, allowLossyConversion: false) {
         handle.write(data)
     }
 }
 
 func encodeJson(_ result: ConversionResult) throws -> String {
-    let encoder = JSONEncoder();
+    let encoder = JSONEncoder()
     encoder.outputFormatting = .prettyPrinted
-    
-    let json = try encoder.encode(result);
-    return String(data: json, encoding: .utf8)!.replacingOccurrences(of: "\\/", with: "/");
+
+    let json = try encoder.encode(result)
+    return String(data: json, encoding: .utf8)!.replacingOccurrences(of: "\\/", with: "/")
 }
 
-do {
-    Logger.log("AG: Conversion started");
-    
-    let arguments: [String] = CommandLine.arguments;
-    if (arguments.count < 4) {
-        writeToStdError(str: "AG: Invalid arguments: Usage: ./CommandLineWrapper -safariVersion=14 -optimize=false -advancedBlocking)");
-        exit(EXIT_FAILURE);
-    }
-    
-    let safariVersionIndex = String.Index(utf16Offset: 15, in: arguments[1]);
-    let safariVersionStr = arguments[1][safariVersionIndex...];
-    
-    guard let safariVersionNum = Int(safariVersionStr) else {
-        throw SafariVersionError.invalidSafariVersion();
-    };
-    
-    guard let safariVersion = SafariVersion(rawValue: safariVersionNum) else {
-        throw SafariVersionError.unsupportedSafariVersion();
-    };
-    
-    Logger.log("AG: Safari version: \(safariVersion)");
-    
-    let optimize = arguments[2] == "-optimize=true";
-    Logger.log("AG: Optimize: \(optimize)");
-    
-    let advancedBlocking = arguments[3] == "-advancedBlocking=true";
-    Logger.log("AG: AdvancedBlocking: \(advancedBlocking)");
-    
-    var rules = [String]();
-    var line: String? = nil;
-    while (true) {
-        line = readLine(strippingNewline: true);
-        if (line == nil || line == "") {
-            break;
+/**
+ * Converter tool
+ * Usage:
+ *  "cat rules.txt | ./ConverterTool -safariVersion=14 -optimize=true -advancedBlocking=false"
+ */
+struct ConverterTool: ParsableCommand {
+    static let configuration = CommandConfiguration(commandName: "ConverterTool")
+
+    @Option(name: .shortAndLong, help: "Safari version.")
+    var safariVersion: Int = 13
+
+    @Option(name: .shortAndLong, help: "Optimize.")
+    var optimize = false
+
+    @Option(name: .shortAndLong, help: "Advanced blocking.")
+    var advancedBlocking = false
+
+    @Argument(help: "Reads rules from standard input.")
+    var rules: String?
+
+    mutating func run() throws {
+        guard let safariVersion = SafariVersion(rawValue: safariVersion) else {
+            throw SafariVersionError.unsupportedSafariVersion()
         }
-        
-        rules.append(line!);
-    }
-    
-    Logger.log("AG: Rules to convert: \(rules.count)");
-    
-    let result: ConversionResult? = ContentBlockerConverter().convertArray(
-        rules: rules, safariVersion: safariVersion, optimize: optimize, advancedBlocking: advancedBlocking
-    );
-
-    Logger.log("AG: Conversion done");
-    
-    if (result == nil) {
-        writeToStdError(str: "AG: ContentBlockerConverter: Empty result.");
-        exit(EXIT_FAILURE);
+
+        Logger.log("Safari version - \(safariVersion)")
+        Logger.log("Optimize - \(optimize)")
+        Logger.log("Advanced blocking - \(advancedBlocking)")
+
+        var rules: [String] = []
+        var line: String?
+        while true {
+            line = readLine(strippingNewline: true)
+            guard let unwrappedLine = line, !unwrappedLine.isEmpty else {
+                break
+            }
+
+            rules.append(unwrappedLine)
+        }
+
+        Logger.log("Rules to convert: \(rules.count)")
+
+        let result: ConversionResult? = ContentBlockerConverter()
+            .convertArray(
+                rules: rules,
+                safariVersion: safariVersion,
+                optimize: optimize,
+                advancedBlocking: advancedBlocking
+            )
+
+        Logger.log("Conversion done.")
+
+        guard let result = result else {
+            writeToStdError(str: "ContentBlockerConverter: Empty result.")
+            Foundation.exit(EXIT_FAILURE)
+        }
+
+        let encoded = try encodeJson(result)
+
+        writeToStdOut(str: "\(encoded)")
     }
-    
-    let encoded = try encodeJson(result!);
-    
-    writeToStdOut(str: "\(encoded)");
-    exit(EXIT_SUCCESS);
-} catch {
-    writeToStdError(str: "AG: ContentBlockerConverter: Unexpected error: \(error)");
-    exit(EXIT_FAILURE);
 }
 
+ConverterTool.main()