mirror of
https://github.com/discourse/discourse.git
synced 2024-11-27 04:33:40 +08:00
3d55f2e3b7
Fixed bugs, added specs, extracted the upload downsizing code to a class, added support for non-S3 setups, changed it so that images aren't downloaded twice. This code has been tested on production and successfully resized ~180k uploads. Includes: * DEV: Extract upload downsizing logic * DEV: Add support for non-S3 uploads * DEV: Process only images uploaded by users * FIX: Incorrect usage of `count` and `exist?` typo * DEV: Spec S3 image downsizing * DEV: Avoid downloading images twice * DEV: Update filesizes earlier in the process * DEV: Return false on invalid upload * FIX: Download images that currently above the limit (If the image size limit is decreased, then there was no way to resize those images that now fall outside the allowed size range) * Update script/downsize_uploads.rb (Co-authored-by: Régis Hanol <regis@hanol.fr>)
104 lines
2.9 KiB
Ruby
104 lines
2.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe ShrinkUploadedImage do
|
|
context "when local uploads are enabled" do
|
|
let(:upload) { Fabricate(:image_upload, width: 200, height: 200) }
|
|
|
|
it "resizes the image" do
|
|
filesize_before = upload.filesize
|
|
post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
|
|
post.link_post_uploads
|
|
|
|
result = ShrinkUploadedImage.new(
|
|
upload: upload,
|
|
path: Discourse.store.path_for(upload),
|
|
max_pixels: 10_000
|
|
).perform
|
|
|
|
expect(result).to be(true)
|
|
expect(upload.width).to eq(100)
|
|
expect(upload.height).to eq(100)
|
|
expect(upload.filesize).to be < filesize_before
|
|
end
|
|
|
|
it "returns false if the image is not used by any models" do
|
|
result = ShrinkUploadedImage.new(
|
|
upload: upload,
|
|
path: Discourse.store.path_for(upload),
|
|
max_pixels: 10_000
|
|
).perform
|
|
|
|
expect(result).to be(false)
|
|
end
|
|
|
|
it "returns false if the image cannot be shrunk more" do
|
|
post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
|
|
post.link_post_uploads
|
|
ShrinkUploadedImage.new(
|
|
upload: upload,
|
|
path: Discourse.store.path_for(upload),
|
|
max_pixels: 10_000
|
|
).perform
|
|
|
|
upload.reload
|
|
|
|
result = ShrinkUploadedImage.new(
|
|
upload: upload,
|
|
path: Discourse.store.path_for(upload),
|
|
max_pixels: 10_000
|
|
).perform
|
|
|
|
expect(result).to be(false)
|
|
end
|
|
|
|
it "returns false when the upload is above the size limit" do
|
|
post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
|
|
post.link_post_uploads
|
|
SiteSetting.max_image_size_kb = 0.001 # 1 byte
|
|
|
|
result = ShrinkUploadedImage.new(
|
|
upload: upload,
|
|
path: Discourse.store.path_for(upload),
|
|
max_pixels: 10_000
|
|
).perform
|
|
|
|
expect(result).to be(false)
|
|
end
|
|
end
|
|
|
|
context "when S3 uploads are enabled" do
|
|
let(:upload) { Fabricate(:s3_image_upload, width: 200, height: 200) }
|
|
|
|
before do
|
|
SiteSetting.enable_s3_uploads = true
|
|
SiteSetting.s3_access_key_id = "fakeid7974664"
|
|
SiteSetting.s3_secret_access_key = "fakesecretid7974664"
|
|
|
|
store = FileStore::S3Store.new
|
|
s3_helper = store.instance_variable_get(:@s3_helper)
|
|
client = Aws::S3::Client.new(stub_responses: true)
|
|
s3_helper.stubs(:s3_client).returns(client)
|
|
Discourse.stubs(:store).returns(store)
|
|
end
|
|
|
|
it "resizes the image" do
|
|
filesize_before = upload.filesize
|
|
post = Fabricate(:post, raw: "<img src='#{upload.url}'>")
|
|
post.link_post_uploads
|
|
|
|
result = ShrinkUploadedImage.new(
|
|
upload: upload,
|
|
path: Discourse.store.download(upload).path,
|
|
max_pixels: 10_000
|
|
).perform
|
|
|
|
expect(result).to be(true)
|
|
expect(upload.width).to eq(100)
|
|
expect(upload.height).to eq(100)
|
|
expect(upload.filesize).to be < filesize_before
|
|
end
|
|
end
|
|
end
|