FIX: key optimized images on format #32575
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
Previous to this change when we used to specify format it could get an image in the incorrect format. Also... allows image magick to decode svg --- There remains a bug where the crop / resize information is not stored in optimized images this means that sometimes when asking for a cropped image you may get a resized one.
ZogStriP
reviewed
May 5, 2025
ZogStriP
reviewed
May 5, 2025
| @@ -49,7 +49,8 @@ def self.create_for(upload, width, height, opts = {}) | |||
| end | |||
|
|
|||
| # prefer to look up the thumbnail without grabbing any locks | |||
| thumbnail = find_by(upload_id: upload.id, width: width, height: height) | |||
| extension = ".#{opts[:format] || upload.extension}" | |||
There was a problem hiding this comment.
Do we want to store the leading . for every single optimized images? 🤔
There was a problem hiding this comment.
Is "format" to correct name for the option? Why not "extension"?
There was a problem hiding this comment.
agree this needs cleaning up, but I worry about the huge rabbit hole here. The . and calling this format is very confusing.
ZogStriP
reviewed
May 5, 2025
| @@ -49,7 +49,8 @@ def self.create_for(upload, width, height, opts = {}) | |||
| end | |||
|
|
|||
| # prefer to look up the thumbnail without grabbing any locks | |||
| thumbnail = find_by(upload_id: upload.id, width: width, height: height) | |||
| extension = ".#{opts[:format] || upload.extension}" | |||
| thumbnail = find_by(upload_id: upload.id, width: width, height: height, extension: extension) | |||
There was a problem hiding this comment.
Nitpick: you can omit the variables when the keys have the same name
Suggested change
| thumbnail = find_by(upload_id: upload.id, width: width, height: height, extension: extension) | |
| thumbnail = find_by(upload_id: upload.id, width:, height:, extension:) |
ZogStriP
reviewed
May 5, 2025
app/models/optimized_image.rb
Outdated
| @@ -93,7 +93,7 @@ def self.create_for(upload, width, height, opts = {}) | |||
| opts = opts.merge(quality: target_quality) if target_quality | |||
| opts = opts.merge(upload_id: upload.id) | |||
|
|
|||
| if upload.extension == "svg" | |||
| if extension == ".svg" && upload.extension == "svg" | |||
There was a problem hiding this comment.
I think just extension == ".svg" is enough here? We can't convert any raster images into an SVG anyways.
There was a problem hiding this comment.
I think this is a good point I guess we should reject earlier...
ZogStriP
approved these changes
May 5, 2025
|
thanks @ZogStriP |
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.
Previous to this change when we used to specify format it could get an image
in the incorrect format.
Also... allows image magick to decode svg
There remains a bug where the crop / resize information is not stored in optimized images
this means that sometimes when asking for a cropped image you may get a resized one.