Minor issues fix

1. Fix multiple parts output logs
2. Add opened flag for auto open

Author: sunnyyoung

Sources/AppleReserver/Request.swift

@@ -44,13 +44,13 @@ struct Request {
         }
     }
 
-    static func monitor(region: String, model: String, storeNumbers: [String], partNumbers: [String]) -> Promise<[String: String]> {
+    static func monitor(region: String, model: String, storeNumbers: [String], partNumbers: [String]) -> Promise<[(String, String)]> {
         Promise { seal in
             AF.request(AppleURL.availability(of: region, model: model)).responseJSON { (response) in
                 if let error = response.error {
                     seal.reject(error)
                 } else {
-                    var results: [String: String] = [:]
+                    var results: [(String, String)] = []
                     let stores = ((response.value as? [String: Any])?["stores"] as? [String: Any]) ?? [:]
                     for store in stores.filter({ storeNumbers.contains($0.key) }) {
                         guard let parts = store.value as? [String: [String: [String: Bool]]] else {
@@ -60,11 +60,7 @@ struct Request {
                             guard Availability(key: part.key, value: part.value).available else {
                                 continue
                             }
-                            if results.contains(where: { $0.key == store.key }) {
-                                results[store.key]?.append(part.key)
-                            } else {
-                                results[store.key] = part.key
-                            }
+                            results.append((store.key, part.key))
                         }
                     }
                     seal.fulfill(results)

Sources/AppleReserver/main.swift

@@ -64,11 +64,13 @@ struct Availabilities: ParsableCommand {
 struct Monitor: ParsableCommand {
     static var configuration = CommandConfiguration(abstract: "Monitor the availabilities for the specific stores and parts.")
     static var repeater: Repeater?
-    static var count: UInt = 0
 
     @Option(name: .shortAndLong, help: "Refresh interval")
     var interval: UInt8 = 3
 
+    @Option(name: .shortAndLong, help: "Auto open reverse URL")
+    var autoOpen: Bool = false
+
     @Option(name: .shortAndLong, help: "Region, eg: CN, MO")
     var region: String = "CN"
 
@@ -82,18 +84,23 @@ struct Monitor: ParsableCommand {
     var partNumbers: [String]
 
     func run() throws {
+        var count = 0
+        var opened = false
         Monitor.repeater = .every(.seconds(Double(interval))) { _ in
             firstly {
                 Request.monitor(region: region, model: model, storeNumbers: storeNumbers, partNumbers: partNumbers)
             }.done { results in
-                Monitor.count += 1
+                count += 1
                 if results.isEmpty {
-                    print("\u{1B}[1A\u{1B}[KChecked for \(Monitor.count) times.")
+                    opened = false
+                    print("\u{1B}[1A\u{1B}[KChecked for \(count) times.")
                 } else {
                     results.forEach { (store: String, part: String) in
                         let url = AppleURL.reserve(of: region, model: model, store: store, part: part)
                         print("🚨 [\(part)] 马上预约：\(url)")
+                        if autoOpen && !opened { Script.execute(command: "open '\(url.absoluteString)'") }
                     }
+                    opened = true
                 }
             }.catch { error in
                 print(error)