Jelajahi Sumber

Revert "Get data in on processing queue"

This reverts commit 7e7aa77ca3a0c0d3e84ba86f765e86ff22073eda.
Rob Jonson 4 tahun lalu
induk
melakukan
553ce9b228
1 mengubah file dengan 21 tambahan dan 23 penghapusan
  1. 21 23
      Sources/General/KingfisherManager.swift

+ 21 - 23
Sources/General/KingfisherManager.swift

@@ -344,35 +344,33 @@ public class KingfisherManager {
         completionHandler: ((Result<ImageLoadingResult, KingfisherError>) -> Void)?)
         completionHandler: ((Result<ImageLoadingResult, KingfisherError>) -> Void)?)
     {
     {
         guard let  completionHandler = completionHandler else { return }
         guard let  completionHandler = completionHandler else { return }
-        (options.processingQueue ?? self.processingQueue).execute {
-            provider.data { result in
-                switch result {
-                case .success(let data):
-                    (options.processingQueue ?? self.processingQueue).execute {
-                        let processor = options.processor
-                        let processingItem = ImageProcessItem.data(data)
-                        guard let image = processor.process(item: processingItem, options: options) else {
-                            options.callbackQueue.execute {
-                                let error = KingfisherError.processorError(
-                                    reason: .processingFailed(processor: processor, item: processingItem))
-                                completionHandler(.failure(error))
-                            }
-                            return
-                        }
-                        
+        provider.data { result in
+            switch result {
+            case .success(let data):
+                (options.processingQueue ?? self.processingQueue).execute {
+                    let processor = options.processor
+                    let processingItem = ImageProcessItem.data(data)
+                    guard let image = processor.process(item: processingItem, options: options) else {
                         options.callbackQueue.execute {
                         options.callbackQueue.execute {
-                            let result = ImageLoadingResult(image: image, url: nil, originalData: data)
-                            completionHandler(.success(result))
+                            let error = KingfisherError.processorError(
+                                reason: .processingFailed(processor: processor, item: processingItem))
+                            completionHandler(.failure(error))
                         }
                         }
+                        return
                     }
                     }
-                case .failure(let error):
+
                     options.callbackQueue.execute {
                     options.callbackQueue.execute {
-                        let error = KingfisherError.imageSettingError(
-                            reason: .dataProviderError(provider: provider, error: error))
-                        completionHandler(.failure(error))
+                        let result = ImageLoadingResult(image: image, url: nil, originalData: data)
+                        completionHandler(.success(result))
                     }
                     }
-                    
                 }
                 }
+            case .failure(let error):
+                options.callbackQueue.execute {
+                    let error = KingfisherError.imageSettingError(
+                        reason: .dataProviderError(provider: provider, error: error))
+                    completionHandler(.failure(error))
+                }
+
             }
             }
         }
         }
     }
     }