Merge pull request onevcat#696 from onevcat/fix/manager-default-options

Consider manager default options
hulizhen · Jun 2, 2017 · bd5f0f9 · bd5f0f9
2 parents 2e985b8 + e6a661d
commit bd5f0f9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Sources/KingfisherManager.swift b/Sources/KingfisherManager.swift
@@ -88,6 +88,10 @@ public class KingfisherManager {
     /// - Note: This option will not be applied to independent using of `ImageDownloader` or `ImageCache`.
     public var defaultOptions = KingfisherEmptyOptionsInfo
 
+    var currentDefaultOptions: KingfisherOptionsInfo {
+        return [.downloader(downloader), .targetCache(cache)] + defaultOptions
+    }
+
     convenience init() {
         self.init(downloader: .default, cache: .default)
     }
@@ -117,7 +121,7 @@ public class KingfisherManager {
         completionHandler: CompletionHandler?) -> RetrieveImageTask
     {
         let task = RetrieveImageTask()
-        let options = defaultOptions + (options ?? KingfisherEmptyOptionsInfo)
+        let options = currentDefaultOptions + (options ?? KingfisherEmptyOptionsInfo)
         if options.forceRefresh {
             _ = downloadAndCacheImage(
                 with: resource.downloadURL,