update

Demo/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Tiercel</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

Package.swift

@@ -0,0 +1,22 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Tiercel",
+    platforms: [.iOS(.v8)],
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "Tiercel",
+            targets: ["Tiercel"]),
+    ],
+    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: "Tiercel",
+            path: "Sources")
+    ]
+)

Tiercel/General/DownloadTask.swift → Sources/General/DownloadTask.swift

@@ -32,29 +32,29 @@ public class DownloadTask: Task<DownloadTask> {
         case resumeData
     }
 
-    internal var task: URLSessionDownloadTask? {
+    internal var sessionTask: URLSessionDownloadTask? {
         willSet {
-            task?.removeObserver(self, forKeyPath: "currentRequest")
+            sessionTask?.removeObserver(self, forKeyPath: "currentRequest")
         }
         didSet {
-            task?.addObserver(self, forKeyPath: "currentRequest", options: [.new], context: nil)
+            sessionTask?.addObserver(self, forKeyPath: "currentRequest", options: [.new], context: nil)
         }
     }
 
     public var originalRequest: URLRequest? {
-        task?.originalRequest
+        sessionTask?.originalRequest
     }
 
     public var currentRequest: URLRequest? {
-        task?.currentRequest
+        sessionTask?.currentRequest
     }
 
     public var response: URLResponse? {
-        task?.response
+        sessionTask?.response
     }
 
     public var statusCode: Int? {
-        (task?.response as? HTTPURLResponse)?.statusCode
+        (sessionTask?.response as? HTTPURLResponse)?.statusCode
     }
 
     public var filePath: String {
@@ -130,7 +130,7 @@ public class DownloadTask: Task<DownloadTask> {
         try container.encodeIfPresent(resumeData, forKey: .resumeData)
     }
 
-    public required init(from decoder: Decoder) throws {
+    internal required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let superDecoder = try container.superDecoder()
         try super.init(from: superDecoder)
@@ -154,14 +154,14 @@ public class DownloadTask: Task<DownloadTask> {
     }
 
     deinit {
-        task?.removeObserver(self, forKeyPath: "currentRequest")
+        sessionTask?.removeObserver(self, forKeyPath: "currentRequest")
         NotificationCenter.default.removeObserver(self)
     }
 
     @objc private func fixDelegateMethodError() {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            self.task?.suspend()
-            self.task?.resume()
+            self.sessionTask?.suspend()
+            self.sessionTask?.resume()
         }
     }
 
@@ -186,7 +186,7 @@ extension DownloadTask {
                 progress.totalUnitCount = length
             }
             succeeded()
-            manager?.process()
+            manager?.determineStatus()
             return
         }
         download()
@@ -204,7 +204,7 @@ extension DownloadTask {
             }
         case .succeeded:
             succeeded()
-            manager.process()
+            manager.determineStatus()
         case .running:
             TiercelLog("[downloadTask] running", identifier: manager.identifier, url: url)
         default: break
@@ -216,11 +216,11 @@ extension DownloadTask {
         if let resumeData = resumeData {
             cache.retrieveTmpFile(self)
             if #available(iOS 10.2, *) {
-                task = session?.downloadTask(withResumeData: resumeData)
+                sessionTask = session?.downloadTask(withResumeData: resumeData)
             } else if #available(iOS 10.0, *) {
-                task = session?.correctedDownloadTask(withResumeData: resumeData)
+                sessionTask = session?.correctedDownloadTask(withResumeData: resumeData)
             } else {
-                task = session?.downloadTask(withResumeData: resumeData)
+                sessionTask = session?.downloadTask(withResumeData: resumeData)
             }
         } else {
             var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalCacheData, timeoutInterval: 0)
@@ -229,12 +229,12 @@ extension DownloadTask {
                     request.setValue(value, forHTTPHeaderField: key)
                 }
             }
-            task = session?.downloadTask(with: request)
+            sessionTask = session?.downloadTask(with: request)
         }
         speed = 0
         progress.setUserInfoObject(progress.completedUnitCount, forKey: .fileCompletedCountKey)
 
-        task?.resume()
+        sessionTask?.resume()
 
         if startDate == 0 {
             startDate = Date().timeIntervalSince1970
@@ -252,7 +252,7 @@ extension DownloadTask {
 
         if status == .running {
             status = .willSuspend
-            task?.cancel(byProducingResumeData: { _ in })
+            sessionTask?.cancel(byProducingResumeData: { _ in })
         }
 
         if status == .waiting {
@@ -262,7 +262,7 @@ extension DownloadTask {
             controlExecuter?.execute(self)
             failureExecuter?.execute(self)
 
-            manager?.process()
+            manager?.determineStatus()
         }
     }
 
@@ -271,14 +271,14 @@ extension DownloadTask {
         controlExecuter = Executer(onMainQueue: onMainQueue, handler: handler)
         if status == .running {
             status = .willCancel
-            task?.cancel()
+            sessionTask?.cancel()
         } else {
             status = .willCancel
             didCancelOrRemove()
             TiercelLog("[downloadTask] did cancel", identifier: manager?.identifier ?? "", url: url)
             controlExecuter?.execute(self)
             failureExecuter?.execute(self)
-            manager?.process()
+            manager?.determineStatus()
         }
     }
 
@@ -288,14 +288,14 @@ extension DownloadTask {
         controlExecuter = Executer(onMainQueue: onMainQueue, handler: handler)
         if status == .running {
             status = .willRemove
-            task?.cancel()
+            sessionTask?.cancel()
         } else {
             status = .willRemove
             didCancelOrRemove()
             TiercelLog("[downloadTask] did remove", identifier: manager?.identifier ?? "", url: url)
             controlExecuter?.execute(self)
             failureExecuter?.execute(self)
-            manager?.process()
+            manager?.determineStatus()
         }
     }
 
@@ -362,7 +362,7 @@ extension DownloadTask {
         validateFile()
     }
 
-    private func detectStatus(error: Error?, statusCode: Int) {
+    private func determineStatus(error: Error?, statusCode: Int) {
         if statusCode != 200 {
             status = .failed
         }
@@ -523,10 +523,10 @@ extension DownloadTask {
         if error == nil && statusCode == 200 {
             succeeded()
         } else {
-            detectStatus(error: error, statusCode: statusCode)
+            determineStatus(error: error, statusCode: statusCode)
         }
 
-        manager?.process()
+        manager?.determineStatus()
     }
 
 }

Tiercel/General/SessionManager.swift → Sources/General/SessionManager.swift

@@ -236,7 +236,7 @@ public class SessionManager {
         shouldCreatSession = true
         operationQueue.sync {
             createSession()
-            updateStatus()
+            restoreStatus()
         }
     }
 
@@ -262,37 +262,7 @@ public class SessionManager {
         completion?()
     }
 
-    private func updateStatus() {
-        if self.tasks.isEmpty {
-            return
-        }
-        session?.getTasksWithCompletionHandler { [weak self] (dataTasks, uploadTasks, downloadTasks) in
-            guard let self = self else { return }
-            downloadTasks.forEach { downloadTask in
-                if downloadTask.state == .running,
-                    let currentURL = downloadTask.currentRequest?.url,
-                    let task = self.fetchTask(currentURL: currentURL) {
-                    task.status = .running
-                    task.task = downloadTask
-                    TiercelLog("[downloadTask] runing", identifier: self.identifier, url: task.url)
-                }
-            }
-
-            //  处理mananger状态
-            let isRunning = self.tasks.filter { $0.status == .running }.count > 0
-            if isRunning {
-                self.didStart()
-                return
-            }
 
-            let isSucceeded = self.tasks.allSatisfy { $0.status == .succeeded }
-            let isCompleted = isSucceeded ? isSucceeded : self.tasks.allSatisfy { $0.status == .succeeded || $0.status == .failed }
-
-            if !self.shouldComplete(isCompleted, isSucceeded) {
-                self.shouldSuspend()
-            }
-        }
-    }
 
 
 }
@@ -518,6 +488,38 @@ extension SessionManager {
 // MARK: - status handle
 extension SessionManager {
 
+    private func restoreStatus() {
+        if self.tasks.isEmpty {
+            return
+        }
+        session?.getTasksWithCompletionHandler { [weak self] (dataTasks, uploadTasks, downloadTasks) in
+            guard let self = self else { return }
+            var isRunning = false
+            downloadTasks.forEach { downloadTask in
+                if downloadTask.state == .running,
+                    let currentURL = downloadTask.currentRequest?.url,
+                    let task = self.fetchTask(currentURL: currentURL) {
+                    task.status = .running
+                    task.sessionTask = downloadTask
+                    TiercelLog("[downloadTask] runing", identifier: self.identifier, url: task.url)
+                    isRunning = true
+                }
+            }
+            //  处理mananger状态
+            if isRunning {
+                self.didStart()
+                return
+            }
+
+            let isSucceeded = self.tasks.allSatisfy { $0.status == .succeeded }
+            let isCompleted = isSucceeded ? isSucceeded : self.tasks.allSatisfy { $0.status == .succeeded || $0.status == .failed }
+
+            if !self.shouldComplete(isCompleted, isSucceeded) {
+                self.shouldSuspend()
+            }
+        }
+    }
+
     internal func didStart() {
         if status != .running {
             createTimer()
@@ -546,7 +548,7 @@ extension SessionManager {
         }
     }
 
-    internal func process() {
+    internal func determineStatus() {
         cache.storeTasks(tasks)
 
         let isSucceeded = tasks.allSatisfy { $0.status == .succeeded }

Tiercel/General/Task.swift → Sources/General/Task.swift

@@ -34,7 +34,7 @@ extension Task {
     }
 }
 
-public class Task<T>: NSObject, NSCoding, Codable {
+public class Task<TaskType>: NSObject, NSCoding, Codable {
 
     private enum CodingKeys: CodingKey {
         case url
@@ -65,15 +65,15 @@ public class Task<T>: NSObject, NSCoding, Codable {
 
     internal var verificationType: FileVerificationType = .md5
 
-    internal var progressExecuter: Executer<T>?
+    internal var progressExecuter: Executer<TaskType>?
 
-    internal var successExecuter: Executer<T>?
+    internal var successExecuter: Executer<TaskType>?
 
-    internal var failureExecuter: Executer<T>?
+    internal var failureExecuter: Executer<TaskType>?
 
-    internal var controlExecuter: Executer<T>?
+    internal var controlExecuter: Executer<TaskType>?
 
-    internal var validateExecuter: Executer<T>?
+    internal var validateExecuter: Executer<TaskType>?
 
     internal let dataQueue = DispatchQueue(label: "com.Tiercel.Task.dataQueue")
 
@@ -314,7 +314,7 @@ public class Task<T>: NSObject, NSCoding, Codable {
 
 
 
-    internal func execute(_ Executer: Executer<T>?) {
+    internal func execute(_ Executer: Executer<TaskType>?) {
 
     }
 
@@ -323,7 +323,7 @@ public class Task<T>: NSObject, NSCoding, Codable {
 
 extension Task {
     @discardableResult
-    public func progress(onMainQueue: Bool = true, _ handler: @escaping Handler<T>) -> Self {
+    public func progress(onMainQueue: Bool = true, _ handler: @escaping Handler<TaskType>) -> Self {
         return operationQueue.sync {
             progressExecuter = Executer(onMainQueue: onMainQueue, handler: handler)
             return self
@@ -332,7 +332,7 @@ extension Task {
     }
 
     @discardableResult
-    public func success(onMainQueue: Bool = true, _ handler: @escaping Handler<T>) -> Self {
+    public func success(onMainQueue: Bool = true, _ handler: @escaping Handler<TaskType>) -> Self {
         operationQueue.sync {
             successExecuter = Executer(onMainQueue: onMainQueue, handler: handler)
         }
@@ -346,7 +346,7 @@ extension Task {
     }
 
     @discardableResult
-    public func failure(onMainQueue: Bool = true, _ handler: @escaping Handler<T>) -> Self {
+    public func failure(onMainQueue: Bool = true, _ handler: @escaping Handler<TaskType>) -> Self {
         operationQueue.sync {
             failureExecuter = Executer(onMainQueue: onMainQueue, handler: handler)
         }

Tiercel/Info.plist → Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>