Update to the adopt the latest 5.x branch code

Author: dreampiggy

Example/Podfile.lock

@@ -1,18 +1,16 @@
 PODS:
-  - SDWebImage/Core (4.3.3)
+  - SDWebImage/Core (5.0.0-beta)
   - SDWebImageYYPlugin (0.1.0):
-    - SDWebImage/Core
+    - SDWebImage/Core (>= 5.0.0-beta)
     - SDWebImageYYPlugin/YYCache (= 0.1.0)
     - SDWebImageYYPlugin/YYImage (= 0.1.0)
   - SDWebImageYYPlugin/YYCache (0.1.0):
-    - SDWebImage/Core
+    - SDWebImage/Core (>= 5.0.0-beta)
     - YYCache
   - SDWebImageYYPlugin/YYImage (0.1.0):
-    - SDWebImage/Core
-    - YYImage
+    - SDWebImage/Core (>= 5.0.0-beta)
+    - YYImage/Core
   - YYCache (1.0.4)
-  - YYImage (1.0.4):
-    - YYImage/Core (= 1.0.4)
   - YYImage/Core (1.0.4)
 
 DEPENDENCIES:
@@ -28,12 +26,12 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   SDWebImage:
-    :commit: ebfe2cedc21adad88e41e7c2d2b8b10a5cf0ff2e
+    :commit: fe2fede60f9c6efcadfac8b90e8cae579656fffb
     :git: [email protected]:rs/SDWebImage.git
 
 SPEC CHECKSUMS:
-  SDWebImage: c16d644f1f195cec9e630cbc25acaaabab25d1b0
-  SDWebImageYYPlugin: 66a53161fd3dbec98f51f5c542b23600a1f31e9a
+  SDWebImage: 55c787b164fabe07f2a4d5307f6e1be7960fb9be
+  SDWebImageYYPlugin: 3941a3f01e054bf6c6c64b5e14fb3ec1822fa994
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 

Example/SDWebImageYYPlugin/SDViewController.m

@@ -8,23 +8,34 @@
 
 #import "SDViewController.h"
 #import <SDWebImageYYPlugin/SDWebImageYYPlugin.h>
+#import <YYImage/YYImage.h>
 
 @interface SDViewController ()
 
+@property (nonatomic, strong) YYAnimatedImageView *imageView;
+
 @end
 
 @implementation SDViewController
 
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
+    [self.view addSubview:self.imageView];
+    
+    NSURL *url = [NSURL URLWithString:@"http://apng.onevcat.com/assets/elephant.png"];
+    [self.imageView sd_setImageWithURL:url completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+        NSLog(@"%@", error);
+    }];
 }
 
-- (void)didReceiveMemoryWarning
-{
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
+- (YYAnimatedImageView *)imageView {
+    if (!_imageView) {
+        _imageView = [[YYAnimatedImageView alloc] initWithFrame:self.view.bounds];
+        _imageView.contentMode = UIViewContentModeScaleAspectFit;
+        _imageView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin;
+    }
+    return _imageView;
 }
 
 @end

Example/SDWebImageYYPlugin/SDWebImageYYPlugin-Info.plist

@@ -24,6 +24,11 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

SDWebImageYYPlugin.podspec

@@ -21,28 +21,27 @@ Pod::Spec.new do |s|
 TODO: Add long description of the pod here.
                        DESC
 
-  s.homepage         = 'https://github.com/DreamPiggy/SDWebImageYYPlugin'
+  s.homepage         = 'https://github.com/SDWebImage/SDWebImageYYPlugin'
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'DreamPiggy' => '[email protected]' }
-  s.source           = { :git => 'https://github.com/DreamPiggy/SDWebImageYYPlugin.git', :tag => s.version.to_s }
+  s.source           = { :git => 'https://github.com/SDWebImage/SDWebImageYYPlugin.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
   s.ios.deployment_target = '8.0'
-  s.tvos.deployment_target = '9.0'
 
   s.source_files = 'SDWebImageYYPlugin/Module/SDWebImageYYPlugin.h'
   s.module_map = 'SDWebImageYYPlugin/Module/SDWebImageYYPlugin.modulemap'
 
-  s.dependency 'SDWebImage/Core'
+  s.dependency 'SDWebImage/Core', '>= 5.0.0-beta'
 
   s.subspec 'YYCache' do |ss|
     ss.dependency 'YYCache'
     ss.source_files = 'SDWebImageYYPlugin/Classes/YYCache/**/*'
   end
 
   s.subspec 'YYImage' do |ss|
-    ss.dependency 'YYImage'
+    ss.dependency 'YYImage/Core'
     ss.source_files = 'SDWebImageYYPlugin/Classes/YYImage/**/*'
   end
 end

SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYCache+SDAddtions.m

@@ -28,25 +28,38 @@
 
 @implementation YYCache (SDAddtions)
 
-- (id<SDWebImageOperation>)queryImageForKey:(NSString *)key options:(SDWebImageOptions)options context:(SDWebImageContext *)context completion:(SDImageCacheQueryCompletionBlock)completionBlock {
+- (id<SDWebImageOperation>)queryImageForKey:(NSString *)key options:(SDWebImageOptions)options context:(SDWebImageContext *)context completion:(SDImageCacheQueryCompletionBlock)doneBlock {
     if (!key) {
-        if (completionBlock) {
-            completionBlock(nil, nil, SDImageCacheTypeNone);
+        if (doneBlock) {
+            doneBlock(nil, nil, SDImageCacheTypeNone);
         }
         return nil;
     }
 
+    if ([context valueForKey:SDWebImageContextImageTransformer]) {
+        // grab the transformed disk image if transformer provided
+        id<SDImageTransformer> transformer = [context valueForKey:SDWebImageContextImageTransformer];
+        NSString *transformerKey = [transformer transformerKey];
+        key = SDTransformedKeyForKey(key, transformerKey);
+    }
+    
     // First check the in-memory cache...
     UIImage *image = [self.memoryCache objectForKey:key];
-    BOOL shouldQueryMemoryOnly = ([image isKindOfClass:[UIImage class]] && !(options & SDImageCacheQueryDataWhenInMemory));
+    BOOL shouldQueryMemoryOnly = (image && !(options & SDImageCacheQueryMemoryData));
     if (shouldQueryMemoryOnly) {
-        if (completionBlock) {
-            completionBlock(image, nil, SDImageCacheTypeMemory);
+        if (doneBlock) {
+            doneBlock(image, nil, SDImageCacheTypeMemory);
         }
         return nil;
     }
 
+    // Second check the disk cache...
     NSOperation *operation = [NSOperation new];
+    // Check whether we need to synchronously query disk
+    // 1. in-memory cache hit & memoryDataSync
+    // 2. in-memory cache miss & diskDataSync
+    BOOL shouldQueryDiskSync = ((image && options & SDImageCacheQueryMemoryDataSync) ||
+                                (!image && options & SDImageCacheQueryDiskDataSync));
     void(^queryDiskBlock)(NSData *) =  ^(NSData *diskData){
         if (operation.isCancelled) {
             // do not call the completion if cancelled
@@ -57,17 +70,10 @@ @implementation YYCache (SDAddtions)
             UIImage *diskImage;
             SDImageCacheType cacheType = SDImageCacheTypeDisk;
             if (image) {
-                // the image is from in-memory cache
+                // the image is from in-memory cache, but need image data
                 diskImage = image;
                 cacheType = SDImageCacheTypeMemory;
             } else if (diskData) {
-                NSString *cacheKey = key;
-                if ([context valueForKey:SDWebImageContextImageTransformer]) {
-                    // grab the transformed disk image if transformer provided
-                    id<SDImageTransformer> transformer = [context valueForKey:SDWebImageContextImageTransformer];
-                    NSString *transformerKey = [transformer transformerKey];
-                    cacheKey = SDTransformedKeyForKey(key, transformerKey);
-                }
                 // decode image data only if in-memory cache missed
                 diskImage = SDImageCacheDecodeImageData(diskData, key, options, context);
                 if (diskImage) {
@@ -76,19 +82,19 @@ @implementation YYCache (SDAddtions)
                 }
             }
 
-            if (completionBlock) {
-                if (options & SDImageCacheQueryDiskSync) {
-                    completionBlock(diskImage, diskData, cacheType);
+            if (doneBlock) {
+                if (shouldQueryDiskSync) {
+                    doneBlock(diskImage, diskData, cacheType);
                 } else {
                     dispatch_async(dispatch_get_main_queue(), ^{
-                        completionBlock(diskImage, diskData, cacheType);
+                        doneBlock(diskImage, diskData, cacheType);
                     });
                 }
             }
         }
     };
 
-    if (options & SDImageCacheQueryDiskSync) {
+    if (shouldQueryDiskSync) {
         NSData *diskData = [self.diskCache dataForKey:key];
         queryDiskBlock(diskData);
     } else {

SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYAnimatedImageView+WebCache.h

@@ -114,7 +114,7 @@
 - (void)sd_setImageWithURL:(nullable NSURL *)url
           placeholderImage:(nullable UIImage *)placeholder
                    options:(SDWebImageOptions)options
-                  progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock
+                  progress:(nullable SDImageLoaderProgressBlock)progressBlock
                  completed:(nullable SDExternalCompletionBlock)completedBlock;
 
 /**
@@ -138,7 +138,7 @@
           placeholderImage:(nullable UIImage *)placeholder
                    options:(SDWebImageOptions)options
                    context:(nullable SDWebImageContext *)context
-                  progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock
+                  progress:(nullable SDImageLoaderProgressBlock)progressBlock
                  completed:(nullable SDExternalCompletionBlock)completedBlock;
 
 @end

SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYAnimatedImageView+WebCache.m

@@ -35,15 +35,15 @@ - (void)sd_setImageWithURL:(nullable NSURL *)url placeholderImage:(nullable UIIm
     [self sd_setImageWithURL:url placeholderImage:placeholder options:options progress:nil completed:completedBlock];
 }
 
-- (void)sd_setImageWithURL:(nullable NSURL *)url placeholderImage:(nullable UIImage *)placeholder options:(SDWebImageOptions)options progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock completed:(nullable SDExternalCompletionBlock)completedBlock {
+- (void)sd_setImageWithURL:(nullable NSURL *)url placeholderImage:(nullable UIImage *)placeholder options:(SDWebImageOptions)options progress:(nullable SDImageLoaderProgressBlock)progressBlock completed:(nullable SDExternalCompletionBlock)completedBlock {
     [self sd_setImageWithURL:url placeholderImage:placeholder options:options context:nil progress:progressBlock completed:completedBlock];
 }
 
 - (void)sd_setImageWithURL:(nullable NSURL *)url
           placeholderImage:(nullable UIImage *)placeholder
                    options:(SDWebImageOptions)options
                    context:(nullable SDWebImageContext *)context
-                  progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock
+                  progress:(nullable SDImageLoaderProgressBlock)progressBlock
                  completed:(nullable SDExternalCompletionBlock)completedBlock {
     Class animatedImageClass = [YYImage class];
     SDWebImageMutableContext *mutableContext;