Skip to content

A platform for community discussion. Free, open, simple.

FIX: Stop incorrectly converting non-JPEG uploads to JPEG (#43710)

Alan Guo Xiang Tanf2a69709dd95
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 24d35d32c5c..ea33d19687e 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -97,7 +97,7 @@ class OptimizedImage < ActiveRecord::Base
temp_path = temp_file.path
target_quality =
- upload.target_image_quality(
+ upload.target_jpeg_image_quality(
original_path,
SiteSetting.ImageQuality.image_preview_jpg_quality,
)
diff --git a/app/models/upload.rb b/app/models/upload.rb
index ac9de820916..3256086180a 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -448,7 +448,7 @@ class Upload < ActiveRecord::Base
end
end
- def target_image_quality(local_path, test_quality)
+ def target_jpeg_image_quality(local_path, test_quality)
@file_quality ||=
begin
ImageMagick.identify(
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 4e61d770746..206da4dd428 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -114,7 +114,7 @@ class UploadCreator
clean_svg!
elsif @image_info.type != :ico && (!Rails.env.test? || @opts[:force_optimize])
convert_heif! if %i[heic heif].include?(@image_info.type)
- convert_to_jpeg! if convert_png_to_jpeg? || should_alter_quality?
+ convert_to_jpeg! if convert_png_to_jpeg? || should_alter_jpeg_quality?
fix_orientation! if should_fix_orientation?
crop! if should_crop?
optimize! if should_optimize?
@@ -369,7 +369,7 @@ class UploadCreator
SiteSetting.ImageQuality.recompress_original_jpg_quality,
].compact.min
- target_quality = @upload.target_image_quality(@file.path, desired_quality)
+ target_quality = @upload.target_jpeg_image_quality(@file.path, desired_quality)
opts = { quality: target_quality } if target_quality
read = [@file.path]
@@ -445,19 +445,13 @@ class UploadCreator
)
end
- def should_alter_quality?
- return false if animated?
+ def should_alter_jpeg_quality?
+ return false if @image_info.type != :jpeg
- desired_quality =
- (
- if @image_info.type == :png
- SiteSetting.ImageQuality.png_to_jpg_quality
- else
- SiteSetting.ImageQuality.recompress_original_jpg_quality
- end
- )
-
- @upload.target_image_quality(@file.path, desired_quality).present?
+ @upload.target_jpeg_image_quality(
+ @file.path,
+ SiteSetting.ImageQuality.recompress_original_jpg_quality,
+ ).present?
end
def should_downsize?
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
index 7da7349a2fc..8a9db1265c4 100644
--- a/spec/lib/upload_creator_spec.rb
+++ b/spec/lib/upload_creator_spec.rb
@@ -382,7 +382,7 @@ RSpec.describe UploadCreator do
it "does not store a JPEG when the absolute byte savings are insufficient" do
# logo.png is 2297 bytes, converting to jpeg saves 30% but does not meet
- # the absolute savings required of 25_000 bytes, if you save less than that
+ # the absolute savings required of 75_000 bytes, if you save less than that
# skip this
expect do
@@ -450,8 +450,15 @@ RSpec.describe UploadCreator do
SiteSetting.image_preview_jpg_quality = 10
end
- it "alters the image quality" do
- upload = UploadCreator.new(file, filename, force_optimize: true).create_for(user.id)
+ it "alters the JPEG image quality" do
+ jpeg_file = file_from_fixtures("logo.jpg")
+ File.truncate(
+ jpeg_file.path,
+ UploadCreator::MIN_CONVERT_TO_JPEG_BYTES_SAVED + jpeg_file.size,
+ )
+
+ upload =
+ UploadCreator.new(jpeg_file, "logo.jpg", force_optimize: true).create_for(user.id)
expect(image_quality(upload.url)).to eq(SiteSetting.recompress_original_jpg_quality)
@@ -525,6 +532,18 @@ RSpec.describe UploadCreator do
expect(File.extname(upload.url)).to eq(".webp")
expect(upload.original_filename).to eq("animated.webp")
end
+
+ it "does not convert non-JPEG images to JPEG based on JPEG quality" do
+ filename = "static.gif"
+ file = file_from_fixtures(filename)
+ File.truncate(file.path, UploadCreator::MIN_CONVERT_TO_JPEG_BYTES_SAVED + 1_000)
+
+ upload = UploadCreator.new(file, filename, force_optimize: true).create_for(user.id)
+
+ expect(upload).to be_persisted
+ expect(upload).to have_attributes(extension: "gif", original_filename: filename)
+ expect(FastImage.type(Discourse.store.path_for(upload))).to eq(:gif)
+ end
end
end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 965f2e62f7e..6598231c899 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -1170,17 +1170,17 @@ RSpec.describe Upload do
end
end
- describe "#target_image_quality" do
+ describe "#target_jpeg_image_quality" do
let(:local_path) { Rails.root.join("spec/fixtures/images/logo.jpg").to_s }
it "returns nil when the target quality is higher than the source quality" do
- target_quality = upload.target_image_quality(local_path, 100)
+ target_quality = upload.target_jpeg_image_quality(local_path, 100)
expect(target_quality).to eq(nil)
end
it "returns the target quality when it is lower than the source quality" do
- target_quality = upload.target_image_quality(local_path, 10)
+ target_quality = upload.target_jpeg_image_quality(local_path, 10)
expect(target_quality).to eq(10)
end