Merge pull request onevcat#712 from onevcat/fix/storing-post-process-…

…image Store processed images after checking from cache
openboy2012 · Jun 16, 2017 · b1b2f84 · b1b2f84
2 parents 84b582e + 89e2ac9
commit b1b2f84
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/Sources/KingfisherManager.swift b/Sources/KingfisherManager.swift
@@ -226,29 +226,45 @@ public class KingfisherManager {
         }
 
         let targetCache = options.targetCache
+        // First, try to get the exactly image from cache
         targetCache.retrieveImage(forKey: key, options: options) { image, cacheType in
+            // If found, we could finish now.
             if image != nil {
                 diskTaskCompletionHandler(image, nil, cacheType, url)
                 return
             }
 
+            // If not found, and we are using a default processor, download it!
             let processor = options.processor
-            if processor != DefaultImageProcessor.default {
-                let optionsWithoutProcessor = options.removeAllMatchesIgnoringAssociatedValue(.processor(processor))
-                targetCache.retrieveImage(forKey: key, options: optionsWithoutProcessor) { image, cacheType in
-                    guard let image = image else {
-                        handleNoCache()
-                        return
-                    }
-
-                    let processedImage = processor.process(item: .image(image), options: options)
-                    diskTaskCompletionHandler(processedImage, nil, .none, url)
-                    return
-                }
+            guard processor != DefaultImageProcessor.default else {
+                handleNoCache()
                 return
             }
 
-            handleNoCache()
+            // If processor is not the default one, we have a chance to check whether
+            // the original image is already in cache.
+            let optionsWithoutProcessor = options.removeAllMatchesIgnoringAssociatedValue(.processor(processor))
+            targetCache.retrieveImage(forKey: key, options: optionsWithoutProcessor) { image, cacheType in
+                // If we found the original image, there is no need to download it again.
+                // We could just apply processor to it now.
+                guard let image = image else {
+                    handleNoCache()
+                    return
+                }
+
+                guard let processedImage = processor.process(item: .image(image), options: options) else {
+                    diskTaskCompletionHandler(nil, nil, .none, url)
+                    return
+                }
+                targetCache.store(processedImage,
+                                  original: nil,
+                                  forKey: key,
+                                  processorIdentifier:options.processor.identifier,
+                                  cacheSerializer: options.cacheSerializer,
+                                  toDisk: !options.cacheMemoryOnly,
+                                  completionHandler: nil)
+                diskTaskCompletionHandler(processedImage, nil, .none, url)
+            }
         }
     }
 }
diff --git a/Tests/KingfisherTests/KingfisherManagerTests.swift b/Tests/KingfisherTests/KingfisherManagerTests.swift
@@ -367,13 +367,23 @@ class KingfisherManagerTests: XCTestCase {
         {
             let p = SimpleProcessor()
 
+            let cached = self.manager.cache.isImageCached(forKey: URLString, processorIdentifier: p.identifier)
+            XCTAssertFalse(cached.cached)
+
             // No downloading will happen
             self.manager.retrieveImage(with: URL(string: URLString)!, options: [.processor(p)], progressBlock: nil) {
                 image, error, cacheType, url in
                 XCTAssertNotNil(image)
                 XCTAssertEqual(cacheType, .none)
                 XCTAssertTrue(p.processed)
-                expectation.fulfill()
+
+                // The processed image should be cached
+                delay(0.1) {
+                    let cached = self.manager.cache.isImageCached(forKey: URLString, processorIdentifier: p.identifier)
+                    XCTAssertTrue(cached.cached)
+                    expectation.fulfill()
+                }
+
             }
         }
         waitForExpectations(timeout: 5, handler: nil)