Merge pull request #23 from sukov/version-2.0.1

Hotfix Version 2.0.1

Author: sukov

CachingPlayerItem.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'CachingPlayerItem'
-  s.version          = '2.0.0'
+  s.version          = '2.0.1'
   s.summary          = 'Cache & Play audio and video files'
 
   s.homepage         = 'https://github.com/sukov/CachingPlayerItem'

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - CachingPlayerItem (2.0.0)
+  - CachingPlayerItem (2.0.1)
   - Nimble (9.2.1)
   - Quick (4.0.0)
 
@@ -18,7 +18,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  CachingPlayerItem: 61dfcd2931cf590d8f461d4cbee65cd2e643f69b
+  CachingPlayerItem: 7a369d20ddc09f5ac79322fd8ecd5f8369523216
   Nimble: e7e615c0335ee4bf5b0d786685451e62746117d5
   Quick: 6473349e43b9271a8d43839d9ba1c442ed1b7ac4
 

Example/Pods/Local Podspecs/CachingPlayerItem.podspec.json

@@ -22,7 +22,12 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
     private lazy var fileHandle = MediaFileHandle(filePath: saveFilePath)
 
     private var session: URLSession?
-    private let queue = DispatchQueue(label: "com.gcd.CachingPlayerItemQueue", qos: .userInitiated)
+    private let operationQueue = {
+        let queue = OperationQueue()
+        queue.name = "CachingPlayerItemOperationQueue"
+        queue.maxConcurrentOperationCount = 1
+        return queue
+    }()
     private var pendingContentInfoRequest: PendingContentInfoRequest? {
         didSet { oldValue?.cancelTask() }
     }
@@ -42,14 +47,9 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
         self.saveFilePath = saveFilePath
         self.owner = owner
         super.init()
-
         NotificationCenter.default.addObserver(self, selector: #selector(handleAppWillTerminate), name: UIApplication.willTerminateNotification, object: nil)
     }
 
-    deinit {
-        invalidateAndCancelSession(shouldResetData: false)
-    }
-
     // MARK: AVAssetResourceLoaderDelegate
 
     func resourceLoader(_ resourceLoader: AVAssetResourceLoader, shouldWaitForLoadingOfRequestedResource loadingRequest: AVAssetResourceLoadingRequest) -> Bool {
@@ -68,15 +68,15 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
             let request = PendingDataRequest(url: url, session: session, loadingRequest: loadingRequest, customHeaders: owner?.urlRequestHeaders)
             request.delegate = self
             request.startTask()
-            pendingDataRequests[request.id] = request
+            addOperationOnQueue { [weak self] in self?.pendingDataRequests[request.id] = request }
             return true
         } else {
             return false
         }
     }
 
     func resourceLoader(_ resourceLoader: AVAssetResourceLoader, didCancel loadingRequest: AVAssetResourceLoadingRequest) {
-        queue.async { [weak self] in
+        addOperationOnQueue { [weak self] in
             guard let self else { return }
             guard let key = pendingDataRequests.first(where: { $1.loadingRequest.request.url == loadingRequest.request.url })?.key else { return }
 
@@ -88,7 +88,7 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
     // MARK: URLSessionDelegate
 
     func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive data: Data) {
-        queue.async { [weak self] in
+        addOperationOnQueue { [weak self] in
             guard let self else { return }
 
             pendingDataRequests[dataTask.taskIdentifier]?.respond(withRemoteData: data)
@@ -98,7 +98,7 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
             bufferData.append(data)
             writeBufferDataToFileIfNeeded()
 
-            guard let response = contentInfoResponse else { return }
+            guard let response = contentInfoResponse ?? dataTask.response else { return }
 
             DispatchQueue.main.async {
                 self.owner?.delegate?.playerItem?(self.owner!,
@@ -109,12 +109,13 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
     }
 
     func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
-        queue.async { [weak self] in
+        addOperationOnQueue { [weak self] in
             guard let self else { return }
 
             let taskId = task.taskIdentifier
+            if let error {
+                guard (error as? URLError)?.code != .cancelled else { return }
 
-            if let error = error {
                 if pendingContentInfoRequest?.id == taskId {
                     finishLoadingPendingRequest(withId: taskId, error: error)
                     downloadFailed(with: error)
@@ -141,7 +142,7 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
                 writeBufferDataToFileIfNeeded(forced: true)
             }
 
-            let error = verifyResponse()
+            let error = verify(response: contentInfoResponse ?? task.response)
 
             guard error == nil else {
                 downloadFailed(with: error!)
@@ -169,10 +170,11 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
     func invalidateAndCancelSession(shouldResetData: Bool = true) {
         session?.invalidateAndCancel()
         session = nil
+        operationQueue.cancelAllOperations()
 
         if shouldResetData {
             bufferData = Data()
-            queue.async { [weak self] in
+            addOperationOnQueue { [weak self] in
                 guard let self else { return }
 
                 pendingContentInfoRequest = nil
@@ -228,8 +230,8 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
         }
     }
 
-    private func verifyResponse() -> NSError? {
-        guard let response = contentInfoResponse as? HTTPURLResponse else { return nil }
+    private func verify(response: URLResponse?) -> NSError? {
+        guard let response = response as? HTTPURLResponse else { return nil }
 
         let shouldVerifyDownloadedFileSize = CachingPlayerItemConfiguration.shouldVerifyDownloadedFileSize
         let minimumExpectedFileSize = CachingPlayerItemConfiguration.minimumExpectedFileSize
@@ -254,6 +256,16 @@ final class ResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URL
         }
     }
 
+    private func addOperationOnQueue(_ block: @escaping () -> Void) {
+        let blockOperation = BlockOperation()
+        blockOperation.addExecutionBlock({ [unowned blockOperation] in
+            guard blockOperation.isCancelled == false else { return }
+
+            block()
+        })
+        operationQueue.addOperation(blockOperation)
+    }
+
     @objc private func handleAppWillTerminate() {
         invalidateAndCancelSession(shouldResetData: false)
     }
@@ -265,12 +277,12 @@ extension ResourceLoaderDelegate: PendingDataRequestDelegate {
     func pendingDataRequest(_ request: PendingDataRequest, hasSufficientCachedDataFor offset: Int, with length: Int) -> Bool {
         fileHandle.fileSize >= length + offset
     }
-    
+
     func pendingDataRequest(_ request: PendingDataRequest,
                             requestCachedDataFor offset: Int,
                             with length: Int,
                             completion: @escaping ((_ continueRequesting: Bool) -> Void)) {
-        queue.async { [weak self] in
+        addOperationOnQueue { [weak self] in
             guard let self else { return }
 
             let bytesCached = fileHandle.fileSize