mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #487 from Gabro/patch-1 

Enforced presence of a completedBlock in downloadWithURL:options:progress:completed
This commit is contained in:
Olivier Poitrey 2013-08-29 07:41:34 -07:00
parent 22cd4e49c4 5bbddae80d
commit 2bded38216
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDWebImage/SDWebImageManager.h
View File

@ -142,7 +142,9 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager];
* @param progressBlock A block called while image is downloading * @param progressBlock A block called while image is downloading
* @param completedBlock A block called when operation has been completed. * @param completedBlock A block called when operation has been completed.
* *
* This block as no return value and takes the requested UIImage as first parameter. * This parameter is required.
*
* This block has no return value and takes the requested UIImage as first parameter.
* In case of error the image parameter is nil and the second parameter may contain an NSError. * In case of error the image parameter is nil and the second parameter may contain an NSError.
* *
* The third parameter is an `SDImageCacheType` enum indicating if the image was retrived from the local cache * The third parameter is an `SDImageCacheType` enum indicating if the image was retrived from the local cache

12
SDWebImage/SDWebImageManager.m
View File

@ -68,6 +68,9 @@
- (id<SDWebImageOperation>)downloadWithURL:(NSURL *)url options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedWithFinishedBlock)completedBlock - (id<SDWebImageOperation>)downloadWithURL:(NSURL *)url options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedWithFinishedBlock)completedBlock
{ {
// Invoking this method without a completedBlock is pointless
NSParameterAssert(completedBlock);
// Very common mistake is to send the URL using NSString object instead of NSURL. For some strange reason, XCode won't // Very common mistake is to send the URL using NSString object instead of NSURL. For some strange reason, XCode won't
// throw any warning for this type mismatch. Here we failsafe this error by allowing URLs to be passed as NSString. // throw any warning for this type mismatch. Here we failsafe this error by allowing URLs to be passed as NSString.
if ([url isKindOfClass:NSString.class]) if ([url isKindOfClass:NSString.class])
@ -90,16 +93,13 @@
isFailedUrl = [self.failedURLs containsObject:url]; isFailedUrl = [self.failedURLs containsObject:url];
} }
if (!url || !completedBlock || (!(options & SDWebImageRetryFailed) && isFailedUrl)) if (!url || (!(options & SDWebImageRetryFailed) && isFailedUrl))
{ {
if (completedBlock) dispatch_main_sync_safe(^
{ {
dispatch_main_sync_safe(^
{
NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]; NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil];
completedBlock(nil, error, SDImageCacheTypeNone, YES); completedBlock(nil, error, SDImageCacheTypeNone, YES);
}); });
}
return operation; return operation;
} }