Skip to content

Fix bug where requests with processors would not check disk cache for original image data #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JValldejuli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix bug where requests with processors would not check disk cache for original image data #846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Sources/Nuke/Tasks/TaskFetchOriginalData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ final class TaskFetchOriginalData: AsyncPipelineTask<(Data, URLResponse?)>, @unc
return
}

if let data = pipeline.cache.cachedData(for: makeSanitizedRequest()) {
Copy link

@timothy-barnard timothy-barnard Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this be better done in the TaskLoadData since the returnCacheDataDontLoad would block this.

Copy link
Author

@JValldejuli JValldejuli Apr 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like TaskLoadData only backs loadData calls so I don't think so.

I don't think returnCacheDataDontLoad blocking this is necessarily bad since one could argue returnCacheDataDontLoad should return an exact match in the cache for a given request, not cached original data that still needs to go through processors/thumbnail decoding. I don't feel super strongly about it though.

send(value: (data, nil), isCompleted: true)
}

if let rateLimiter = pipeline.rateLimiter {
// Rate limiter is synchronized on pipeline's queue. Delayed work is
// executed asynchronously also on the same queue.
Expand Down Expand Up @@ -183,7 +187,7 @@ extension AsyncPipelineTask where Value == (Data, URLResponse?) {

/// Returns a request that doesn't contain any information non-related
/// to data loading.
private func makeSanitizedRequest() -> ImageRequest {
fileprivate func makeSanitizedRequest() -> ImageRequest {
var request = request
request.processors = []
request.userInfo[.thumbnailKey] = nil
Expand Down