fix counting

chenyanmo · May 22, 2017 · 1e85db5 · 1e85db5
1 parent a606ae2
commit 1e85db5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/source/tinypng4mac/MainViewController.swift b/source/tinypng4mac/MainViewController.swift
@@ -127,7 +127,7 @@ class MainViewController: NSViewController, NSOpenSavePanelDelegate, NSTableView
 			}
 			totalSize += task.originSize
 			totalRecudeSize += (task.originSize - task.resultSize)
-			totalReduce.stringValue = String.localizedStringWithFormat(NSLocalizedString("tasks desc", comment: "tasks desc"), TPStore.sharedStore.count(), Formator.formatSize(totalRecudeSize), Formator.formatRate(totalRecudeSize / totalSize))
+			totalReduce.stringValue = String.localizedStringWithFormat(NSLocalizedString("tasks desc", comment: "tasks desc"), TPClient.sharedClient.finishTasksCount, Formator.formatSize(totalRecudeSize), Formator.formatRate(totalRecudeSize / totalSize))
 
 			if TPClient.sharedClient.queue.isEmpty() {
 				// all finished

diff --git a/source/tinypng4mac/tpclient/TPClient.swift b/source/tinypng4mac/tpclient/TPClient.swift
@@ -33,6 +33,7 @@ class TPClient {
 	let queue = TPQueue()
 	let lock: NSLock = NSLock()
 	var runningTasks = 0
+	var finishTasksCount = 0
 
 	func add(_ tasks: [TPTaskInfo]) {
 		TPStore.sharedStore.add(tasks);
@@ -162,6 +163,9 @@ class TPClient {
 		task.progress = progress
 		if newStatus == .error || newStatus == .finish {
 			self.runningTasks -= 1
+			if newStatus == .finish {
+				self.finishTasksCount += 1
+			}
 		}
 		callback.taskStatusChanged(task: task)
 	}