Merge branch 'develop'

Aria2D.xcodeproj/project.pbxproj

@@ -923,8 +923,8 @@
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.3.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 1.3.8;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
@@ -962,8 +962,8 @@
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.3.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 1.3.8;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";
 				OTHER_SWIFT_FLAGS = "";

Aria2D.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mxcl/PromiseKit",
       "state" : {
-        "revision" : "ed3192004c0b00b4b3d7baa9578ee655c66faae3",
-        "version" : "6.18.0"
+        "revision" : "8a98e31a47854d3180882c8068cc4d9381bf382d",
+        "version" : "6.22.1"
       }
     },
     {
       "identity" : "sparkle",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/sparkle-project/Sparkle",
       "state" : {
-        "revision" : "059ce9128775d5a636c7f4716f71a58919d3111e",
-        "version" : "2.2.1"
+        "revision" : "87e4fcbac39912f9cdb9a9acf205cad60e1ca3bc",
+        "version" : "2.4.2"
       }
     },
     {

Aria2D/Aria2/Aria2.swift

@@ -72,6 +72,17 @@ class Aria2: NSObject {
                 }
 
                 let re = try JSONDecoder().decode(GIDList.self, from: data).result.flatMap ({ $0 }).flatMap ({ $0 })
+
+				let actives = re.filter {
+					$0.contains(where: {
+						$0.value == Status.active.string()
+					})
+				}
+
+				if actives.count == 0 {
+					NotificationCenter.default.post(name: .updateGlobalStat, object: nil, userInfo: ["updateServer": true])
+				}
+
                 try DataManager.shared.sortAllObjects(re)
             }.catch {
                 Log("\(#function) error \($0)")

Aria2D/Aria2/Aria2Websocket.swift

@@ -284,9 +284,7 @@ extension Aria2Websocket: WebSocketDelegate {
                 let gids = json.params.map { $0.gid }
                 switch json.method {
                 case .onDownloadStart:
-                    gids.forEach {
-                        Aria2.shared.initData($0)
-                    }
+					Aria2.shared.updateStatus(gids)
                     ViewControllersManager.shared.showHUD(.downloadStart)
                 case .onDownloadPause:
                     Aria2.shared.updateStatus(gids)

Aria2D/Views/ServerListArrayController.swift

@@ -198,7 +198,7 @@ struct Aria2Servers {
 		required init?(coder aDecoder: NSCoder) {
 			self.contents = aDecoder.decodeObject(forKey: "contents") as? [Aria2ConnectionSettings] ?? []
 			self.selectedID = aDecoder.decodeObject(forKey: "selectedID") as? String ?? ""
-			self.selectedIndex = aDecoder.decodeObject(forKey: "selectedIndex") as? Int ?? 0
+			self.selectedIndex = aDecoder.decodeInteger(forKey: "selectedIndex")
 		}
 
 		func encode(with aCoder: NSCoder) {

Aria2D/Views/Sidebar/SidebarViewController.swift

@@ -134,6 +134,9 @@ class SidebarViewController: NSViewController {
             if isConnected,
                 let activeCount = try? DataManager.shared.activeCount(),
                 activeCount == 0 {
+
+				dockTile.badgeLabel = ""
+				dockTile.badgeLabel = nil
                 globalSpeedView.isHidden = true
             }
         }