-
Notifications
You must be signed in to change notification settings - Fork 0
FEATURE: automatically downsize large images #10
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.
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
base: image-processing-optimization
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -52,14 +52,23 @@ def create_upload(type, file, url) | |||||||||||||||||||||||||||||||||||||||
| begin | ||||||||||||||||||||||||||||||||||||||||
| # API can provide a URL | ||||||||||||||||||||||||||||||||||||||||
| if file.nil? && url.present? && is_api? | ||||||||||||||||||||||||||||||||||||||||
| tempfile = FileHelper.download(url, SiteSetting.max_image_size_kb.kilobytes, "discourse-upload-#{type}") rescue nil | ||||||||||||||||||||||||||||||||||||||||
| tempfile = FileHelper.download(url, 10.megabytes, "discourse-upload-#{type}") rescue nil | ||||||||||||||||||||||||||||||||||||||||
| filename = File.basename(URI.parse(url).path) | ||||||||||||||||||||||||||||||||||||||||
| else | ||||||||||||||||||||||||||||||||||||||||
| tempfile = file.tempfile | ||||||||||||||||||||||||||||||||||||||||
| filename = file.original_filename | ||||||||||||||||||||||||||||||||||||||||
| content_type = file.content_type | ||||||||||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| # allow users to upload large images that will be automatically reduced to allowed size | ||||||||||||||||||||||||||||||||||||||||
| if tempfile && tempfile.size > 0 && SiteSetting.max_image_size_kb > 0 && FileHelper.is_image?(filename) | ||||||||||||||||||||||||||||||||||||||||
| attempt = 5 | ||||||||||||||||||||||||||||||||||||||||
| while attempt > 0 && tempfile.size > SiteSetting.max_image_size_kb.kilobytes | ||||||||||||||||||||||||||||||||||||||||
| OptimizedImage.downsize(tempfile.path, tempfile.path, "80%", allow_animation: SiteSetting.allow_animated_thumbnails) | ||||||||||||||||||||||||||||||||||||||||
| attempt -= 1 | ||||||||||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||||||||||
| end | ||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+63
to
+70
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Critical: File size not refreshed after downsampling. The Additionally, there's no check for whether Apply this diff to fix: # allow users to upload large images that will be automatically reduced to allowed size
if tempfile && tempfile.size > 0 && SiteSetting.max_image_size_kb > 0 && FileHelper.is_image?(filename)
attempt = 5
while attempt > 0 && tempfile.size > SiteSetting.max_image_size_kb.kilobytes
- OptimizedImage.downsize(tempfile.path, tempfile.path, "80%", allow_animation: SiteSetting.allow_animated_thumbnails)
+ success = OptimizedImage.downsize(tempfile.path, tempfile.path, "80%", allow_animation: SiteSetting.allow_animated_thumbnails)
+ break unless success
+ # Reload file size from disk after modification
+ tempfile = File.open(tempfile.path)
attempt -= 1
end
end📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| upload = Upload.create_for(current_user.id, tempfile, filename, tempfile.size, content_type: content_type, image_type: type) | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| if upload.errors.empty? && current_user.admin? | ||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -139,25 +139,24 @@ def self.downsize_instructions_animated(from, to, dimensions, opts={}) | |
| end | ||
|
|
||
| def self.resize(from, to, width, height, opts={}) | ||
| optimize("resize", from, to, width, height, opts) | ||
| optimize("resize", from, to, "#{width}x#{height}", opts) | ||
| end | ||
|
|
||
| def self.downsize(from, to, max_width, max_height, opts={}) | ||
| optimize("downsize", from, to, max_width, max_height, opts) | ||
| optimize("downsize", from, to, "#{max_width}x#{max_height}", opts) | ||
| end | ||
|
|
||
| def self.optimize(operation, from, to, width, height, opts={}) | ||
| dim = dimensions(width, height) | ||
| def self.downsize(from, to, dimensions, opts={}) | ||
| optimize("downsize", from, to, dimensions, opts) | ||
| end | ||
|
Comment on lines
145
to
+151
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 Analysis chainCritical: Method overloading creates a breaking change. Ruby does not support method overloading. The second Any existing code calling Based on static analysis. Run the following script to find all callers of the Consider either:
def self.downsize(from, to, width_or_dimensions, height_or_opts={}, opts={})
if width_or_dimensions.is_a?(String)
# New API: dimensions string
dimensions = width_or_dimensions
opts = height_or_opts
else
# Old API: separate width/height
dimensions = "#{width_or_dimensions}x#{height_or_opts}"
end
optimize("downsize", from, to, dimensions, opts)
end🏁 Script executed: #!/bin/bash
# Description: Find all calls to OptimizedImage.downsize to verify compatibility
# Search for downsize method calls
rg -n -C3 -P '\.downsize\s*\(' --type=rbLength of output: 26 Let me retry with a different approach to search for downsize method calls: 🏁 Script executed: #!/bin/bash
# Find all .rb files and search for downsize calls
fd '\.rb$' -exec rg -l 'downsize' {} \;Length of output: 241 🏁 Script executed: #!/bin/bash
# Search for downsize method calls with context (no file type filter)
rg -n -C3 '\.downsize\s*\(' --include='*.rb'Length of output: 441 🏁 Script executed: #!/bin/bash
# Examine the actual optimized_image.rb file to confirm the duplicate definitions
cat app/models/optimized_image.rb | sed -n '140,155p'Length of output: 559 🏁 Script executed: #!/bin/bash
# Simple search for downsize calls - try basic pattern
rg 'downsize' -nLength of output: 839 🏁 Script executed: #!/bin/bash
# Search specifically in Ruby files for downsize calls with simpler pattern
find . -name "*.rb" -type f | head -20Length of output: 971 Critical: Duplicate method definition breaks existing caller in resize_emoji.rb. The second This call will fail with Fix: Either:
def self.downsize(from, to, width_or_dimensions, height_or_opts={}, opts={})
if width_or_dimensions.is_a?(String)
dimensions = width_or_dimensions
opts = height_or_opts
else
dimensions = "#{width_or_dimensions}x#{height_or_opts}"
end
optimize("downsize", from, to, dimensions, opts)
endUpdate both call sites: 🧰 Tools🪛 RuboCop (1.81.7)[warning] 149-149: Method (Lint/DuplicateMethods) 🤖 Prompt for AI Agents |
||
|
|
||
| def self.optimize(operation, from, to, dimensions, opts={}) | ||
| method_name = "#{operation}_instructions" | ||
| method_name += "_animated" if !!opts[:allow_animation] && from =~ /\.GIF$/i | ||
| instructions = self.send(method_name.to_sym, from, to, dim, opts) | ||
| instructions = self.send(method_name.to_sym, from, to, dimensions, opts) | ||
| convert_with(instructions, to) | ||
| end | ||
|
|
||
| def self.dimensions(width, height) | ||
| "#{width}x#{height}" | ||
| end | ||
|
|
||
| def self.convert_with(instructions, to) | ||
| `#{instructions.join(" ")} &> /dev/null` | ||
| return false if $?.exitstatus != 0 | ||
|
|
||
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.
Wrap the variable declaration in a block to prevent access from other switch clauses.
JavaScript case clauses don't create block scope, so the
maxSizeKBvariable could be accessed by other cases, potentially causing issues.Based on static analysis.
Apply this diff:
📝 Committable suggestion
🧰 Tools
🪛 Biome (2.1.2)
[error] 246-246: Other switch clauses can erroneously access this declaration.
Wrap the declaration in a block to restrict its access to the switch clause.
The declaration is defined in this switch clause:
Safe fix: Wrap the declaration in a block.
(lint/correctness/noSwitchDeclarations)
🤖 Prompt for AI Agents