-
Notifications
You must be signed in to change notification settings - Fork 9
FEATURE: automatically downsize large images #1
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 | ||||||||||||
|
Comment on lines
+66
to
+69
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. logic: Potential infinite loop if |
||||||||||||
| end | ||||||||||||
|
|
||||||||||||
| upload = Upload.create_for(current_user.id, tempfile, filename, tempfile.size, content_type: content_type, image_type: type) | ||||||||||||
|
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. logic: Using potentially stale
Suggested change
|
||||||||||||
|
|
||||||||||||
| 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
+149
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. logic: Duplicate method definition - this
Suggested change
|
||||||||||||||
|
|
||||||||||||||
| 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.
logic: Hardcoding file size limits bypasses site settings and breaks configurability. Consider using a larger site setting or removing frontend validation for images since backend now handles downsizing.