fix(web): use original image if web compatible #17347
Merged
Conversation
This file contains hidden or 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
danieldietzler
approved these changes
Apr 3, 2025
jrasm91
approved these changes
Apr 3, 2025
hackrush01
reviewed
Apr 6, 2025
| ); | ||
| const targetImageSize = $derived.by(() => { | ||
| if ($alwaysLoadOriginalFile || forceUseOriginal || originalImageLoaded) { | ||
| return isWebCompatibleImage(asset) ? 'original' : AssetMediaSize.Fullsize; |
There was a problem hiding this comment.
Hey, was just taking a quick look here, but what happens if a User has $alwaysLoadOriginalFile = true, but they have not enabled the Fullsize preview generation? This function would return the targetImageSize as Fullsize, but the user won't have that generated.
Would this then internally fallback to the Preview image somewhere (I tried to follow the logic till the utils folder but could not find the fallback, maybe I missed something?) or can the image fetch fail?
There was a problem hiding this comment.
The client will be redirected to request the preview instead in this case, which also means the cached preview can be used instead of fetching the preview again from a different link.
kirill-dev-pro
pushed a commit
to kirill-dev-pro/immich-but-with-public-albums-within-instance
that referenced
this pull request
Apr 6, 2025
* use original image if web compatible * add e2e * fix shared link handling * handle redirect in e2e * fix size not being passed to thumbnail url * test fullsize in e2e
midzelis
pushed a commit
that referenced
this pull request
Apr 10, 2025
* use original image if web compatible * add e2e * fix shared link handling * handle redirect in e2e * fix size not being passed to thumbnail url * test fullsize in e2e
savely-krasovsky
pushed a commit
to savely-krasovsky/immich
that referenced
this pull request
Jun 8, 2025
* use original image if web compatible * add e2e * fix shared link handling * handle redirect in e2e * fix size not being passed to thumbnail url * test fullsize in e2e
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
#14446 has a regression in that original images are never displayed. This PR changes the logic to prefer the original over the fullsize image if it's web-compatible. Also reverts back to using the thumbhash as cache key, as it was changed back to checksum in that PR.
Fixes #17334
How Has This Been Tested?
Tested that an HEIC image is displayed in Safari when zooming in and continues to be displayed after zooming out. Enabling "Display original images" makes it display the HEIC image immediately.