Have ASNetworkImageNode report whether images were cached or not #639
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -202,15 +202,11 @@ - (void)cachedImageWithURL:(NSURL *)URL | |
| callbackQueue:(dispatch_queue_t)callbackQueue | ||
| completion:(ASImageCacherCompletion)completion | ||
| { | ||
| [[self sharedPINRemoteImageManager] imageFromCacheWithURL:URL processorKey:nil options:PINRemoteImageManagerDownloadOptionsSkipDecode completion:^(PINRemoteImageManagerResult * _Nonnull result) { | ||
| [ASPINRemoteImageDownloader _performWithCallbackQueue:callbackQueue work:^{ | ||
| completion(result.image); | ||
| }]; | ||
| }]; | ||
| } | ||
|
|
||
| - (void)cachedImageWithURLs:(NSArray <NSURL *> *)URLs | ||
|
|
@@ -256,51 +252,38 @@ - (nullable id)downloadImageWithURLs:(NSArray <NSURL *> *)URLs | |
| downloadProgress:(nullable ASImageDownloaderProgress)downloadProgress | ||
| completion:(ASImageDownloaderCompletion)completion | ||
| { | ||
| PINRemoteImageManagerProgressDownload progressDownload = ^(int64_t completedBytes, int64_t totalBytes) { | ||
| if (downloadProgress == nil) { return; } | ||
|
|
||
| [ASPINRemoteImageDownloader _performWithCallbackQueue:callbackQueue work:^{ | ||
| downloadProgress(completedBytes / (CGFloat)totalBytes); | ||
| }]; | ||
| }; | ||
|
|
||
| PINRemoteImageManagerImageCompletion imageCompletion = ^(PINRemoteImageManagerResult * _Nonnull result) { | ||
| [ASPINRemoteImageDownloader _performWithCallbackQueue:callbackQueue work:^{ | ||
| #if PIN_ANIMATED_AVAILABLE | ||
| if (result.alternativeRepresentation) { | ||
| completion(result.alternativeRepresentation, result.error, result.UUID); | ||
| } else { | ||
| completion(result.image, result.error, result.UUID); | ||
| } | ||
| #else | ||
| completion(result.image, result.error, result.UUID); | ||
| #endif | ||
| }]; | ||
| }; | ||
|
|
||
| // add "IgnoreCache" option since we have a caching API so we already checked it, not worth checking again. | ||
| // PINRemoteImage is responsible for coalescing downloads, and even if it wasn't, the tiny probability of | ||
| // extra downloads isn't worth the effort of rechecking caches every single time. In order to provide | ||
| // feedback to the consumer about whether images are cached, we can't simply make the cache a no-op and | ||
| // check the cache as part of this download. | ||
| return [[self sharedPINRemoteImageManager] downloadImageWithURLs:URLs | ||
| options:PINRemoteImageManagerDownloadOptionsSkipDecode | PINRemoteImageManagerDownloadOptionsIgnoreCache | ||
|
There was a problem hiding this comment. Sadly I don't think we should skip the cache because the synchronous cache check only checks the memory cache not the disk cache. There was a problem hiding this comment. But we'll check the disk cache in There was a problem hiding this comment. I take this back, didn't see that the cache check above was implemented. There was a problem hiding this comment. For history, @Adlai-Holler and I discussed and we think this is safe. He pointed out the only case where this could cause an extra download is: This seems very unlikely in practice. |
||
| progressImage:nil | ||
| progressDownload:progressDownload | ||
| completion:imageCompletion]; | ||
| } | ||
|
|
||
| - (void)cancelImageDownloadForIdentifier:(id)downloadIdentifier | ||
|
|
@@ -369,5 +352,29 @@ - (id)alternateRepresentationWithData:(NSData *)data options:(PINRemoteImageMana | |
| return nil; | ||
| } | ||
|
|
||
| #pragma mark - Private | ||
|
|
||
| /** | ||
| * If on main thread and queue is main, perform now. | ||
| * If queue is nil, assert and perform now. | ||
| * Otherwise, dispatch async to queue. | ||
| */ | ||
| + (void)_performWithCallbackQueue:(dispatch_queue_t)queue work:(void (^)())work | ||
| { | ||
| if (work == nil) { | ||
| // No need to assert here, really. We aren't expecting any feedback from this method. | ||
| return; | ||
| } | ||
|
|
||
| if (ASDisplayNodeThreadIsMain() && queue == dispatch_get_main_queue()) { | ||
| work(); | ||
| } else if (queue == nil) { | ||
| ASDisplayNodeFailAssert(@"Callback queue should not be nil."); | ||
| work(); | ||
| } else { | ||
| dispatch_async(queue, work); | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Added this method because I added another callback path and it felt silly to keep duplicating code. Sorry, dear reviewer! |
||
|
|
||
| @end | ||
| #endif | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We previously weren't calling out to the delegate at all in this synchronous fetch scenario. I think we should.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch!