From ac9b1575dedfa45d3a5f83f8b2d6cd8293300f99 Mon Sep 17 00:00:00 2001
From: Sunny Young <isunnyyoung@gmail.com>
Date: Wed, 10 Dec 2025 00:08:47 +0800
Subject: [PATCH] command: optimize with option group

---
 Sources/WeChatTweak/Config.swift |   4 +-
 Sources/WeChatTweak/main.swift   | 119 +++++++++++++++++--------------
 2 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/Sources/WeChatTweak/Config.swift b/Sources/WeChatTweak/Config.swift
index 57e366f..375ba59 100644
--- a/Sources/WeChatTweak/Config.swift
+++ b/Sources/WeChatTweak/Config.swift
@@ -9,8 +9,6 @@ import Foundation
 import MachO
 
 struct Config: Decodable {
-    static let `default` = URL(string:"https://raw.githubusercontent.com/sunnyyoung/WeChatTweak/refs/heads/master/config.json")!
-
     enum Arch: String, Decodable {
         case arm64
         case x86_64
@@ -83,7 +81,7 @@ struct Config: Decodable {
     let version: String
     let targets: [Target]
 
-    static func load(url: URL = Self.default) async throws -> [Config] {
+    static func load(url: URL) async throws -> [Config] {
         if url.isFileURL {
             return try JSONDecoder().decode(
                 [Config].self,
diff --git a/Sources/WeChatTweak/main.swift b/Sources/WeChatTweak/main.swift
index bf21b68..e853721 100644
--- a/Sources/WeChatTweak/main.swift
+++ b/Sources/WeChatTweak/main.swift
@@ -13,8 +13,14 @@ extension Tweak {
     struct Versions: AsyncParsableCommand {
         static let configuration = CommandConfiguration(abstract: "List all supported WeChat versions")
 
+        @OptionGroup
+        var options: Tweak.Options
+
         mutating func run() async throws {
-            try await Config.load().forEach({ print($0.version) })
+            print("------ Current version ------")
+            print(try await Command.version(app: options.app) ?? "unknown")
+            print("------ Supported versions ------")
+            try await Config.load(url: options.config).forEach({ print($0.version) })
             Darwin.exit(EXIT_SUCCESS)
         }
     }
@@ -23,28 +29,64 @@ extension Tweak {
 // MARK: Patch
 extension Tweak {
     struct Patch: AsyncParsableCommand {
-        enum Error: LocalizedError {
-            case invalidApp
-            case invalidConfig
-            case invalidVersion
-            case unsupportedVersion
-
-            var errorDescription: String? {
-                switch self {
-                case .invalidApp:
-                    return "Invalid app path"
-                case .invalidConfig:
-                    return "Invalid patch config"
-                case .invalidVersion:
-                    return "Invalid app version"
-                case .unsupportedVersion:
-                    return "Unsupported WeChat version"
-                }
-            }
-        }
-
         static let configuration = CommandConfiguration(abstract: "Patch WeChat.app")
 
+        @OptionGroup
+        var options: Tweak.Options
+
+        mutating func run() async throws {
+            print("------ Version ------")
+            let version = try await Command.version(app: options.app)
+            print("WeChat version: \(version ?? "unknown")")
+
+            print("------ Config ------")
+            guard let config = (try await Config.load(url: options.config)).first(where: { $0.version == version }) else {
+                throw Error.unsupportedVersion
+            }
+            print("Matched config: \(config)")
+
+            print("------ Patch ------")
+            try await Command.patch(
+                app: options.app,
+                config: config
+            )
+            print("Done!")
+
+            print("------ Resign ------")
+            try await Command.resign(
+                app: options.app
+            )
+            print("Done!")
+
+            Darwin.exit(EXIT_SUCCESS)
+        }
+    }
+
+}
+
+// MARK: Tweak
+struct Tweak: AsyncParsableCommand {
+    enum Error: LocalizedError {
+        case invalidApp
+        case invalidConfig
+        case invalidVersion
+        case unsupportedVersion
+
+        var errorDescription: String? {
+            switch self {
+            case .invalidApp:
+                return "Invalid app path"
+            case .invalidConfig:
+                return "Invalid patch config"
+            case .invalidVersion:
+                return "Invalid app version"
+            case .unsupportedVersion:
+                return "Unsupported WeChat version"
+            }
+        }
+    }
+
+    struct Options: ParsableArguments {
         @Option(
             name: .shortAndLong,
             help: "Path of WeChat.app",
@@ -71,42 +113,9 @@ extension Tweak {
                 }
             }
         )
-        var config: URL = Config.default
-
-        mutating func run() async throws {
-            print("------ Version ------")
-            guard let version = try await Command.version(app: self.app) else {
-                throw Error.invalidVersion
-            }
-            print("WeChat version: \(version)")
-
-            print("------ Config ------")
-            guard let config = (try await Config.load()).first(where: { $0.version == version }) else {
-                throw Error.unsupportedVersion
-            }
-            print("Matched config: \(config)")
-
-            print("------ Patch ------")
-            try await Command.patch(
-                app: self.app,
-                config: config
-            )
-            print("Done!")
-
-            print("------ Resign ------")
-            try await Command.resign(
-                app: self.app
-            )
-            print("Done!")
-
-            Darwin.exit(EXIT_SUCCESS)
-        }
+        var config: URL = URL(string:"https://raw.githubusercontent.com/sunnyyoung/WeChatTweak/refs/heads/master/config.json")!
     }
 
-}
-
-// MARK: Tweak
-struct Tweak: AsyncParsableCommand {
     static let configuration = CommandConfiguration(
         commandName: "wechattweak",
         abstract: "A command-line tool for tweaking WeChat.",