From 8e7bfd0f29b9973dc145a2fce8be14d2ec5582d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 28 May 2015 01:03:24 +0200 Subject: [PATCH] FIX: automatically growing uploads tree --- app/models/optimized_image.rb | 3 +++ lib/file_store/base_store.rb | 16 ++++++++++++++++ lib/file_store/local_store.rb | 17 ++++------------- lib/file_store/s3_store.rb | 17 ++--------------- spec/components/cooked_post_processor_spec.rb | 4 ++-- spec/components/email/receiver_spec.rb | 2 +- spec/components/file_store/local_store_spec.rb | 12 +++++------- spec/components/file_store/s3_store_spec.rb | 13 +++++-------- 8 files changed, 38 insertions(+), 46 deletions(-) diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index 227b8ffcfd5..4600af8e06f 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -3,6 +3,9 @@ require "digest/sha1" class OptimizedImage < ActiveRecord::Base belongs_to :upload + # BUMP UP if optimized image algorithm changes + VERSION = 1 + def self.create_for(upload, width, height, opts={}) return unless width > 0 && height > 0 diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb index 6fc9e688573..c5b2d80cb64 100644 --- a/lib/file_store/base_store.rb +++ b/lib/file_store/base_store.rb @@ -48,6 +48,22 @@ module FileStore url end + def get_path_for(type, id, sha, extension) + depth = [0, Math.log(id / 1_000.0, 16).ceil].max + tree = File.join(*sha[0, depth].split(""), "") + "#{type}/#{depth + 1}X/#{tree}#{sha}#{extension}" + end + + def get_path_for_upload(upload) + get_path_for("original".freeze, upload.id, upload.sha1, upload.extension) + end + + def get_path_for_optimized_image(optimized_image) + upload = optimized_image.upload + extension = "_#{OptimizedImage::VERSION}_#{optimized_image.width}x#{optimized_image.height}#{optimized_image.extension}" + get_path_for("optimized".freeze, upload.id, upload.sha1, extension) + end + end end diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb index 2fce96c365a..1d009c17845 100644 --- a/lib/file_store/local_store.rb +++ b/lib/file_store/local_store.rb @@ -5,12 +5,12 @@ module FileStore class LocalStore < BaseStore def store_upload(file, upload, content_type = nil) - path = get_path_for_upload(file, upload) + path = get_path_for_upload(upload) store_file(file, path) end def store_optimized_image(file, optimized_image) - path = get_path_for_optimized_image(file, optimized_image) + path = get_path_for_optimized_image(optimized_image) store_file(file, path) end @@ -57,17 +57,8 @@ module FileStore private - def get_path_for_upload(file, upload) - get_path_for("original".freeze, upload.sha1, upload.extension) - end - - def get_path_for_optimized_image(file, optimized_image) - extension = "_#{optimized_image.width}x#{optimized_image.height}#{optimized_image.extension}" - get_path_for("optimized".freeze, optimized_image.sha1, extension) - end - - def get_path_for(type, sha, extension) - "#{relative_base_url}/#{type}/#{sha[0]}/#{sha[1]}/#{sha}#{extension}" + def get_path_for(type, upload_id, sha, extension) + "#{relative_base_url}/#{super(type, upload_id, sha, extension)}" end def store_file(file, path) diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb index 846a5083698..2570d4782cf 100644 --- a/lib/file_store/s3_store.rb +++ b/lib/file_store/s3_store.rb @@ -14,12 +14,12 @@ module FileStore end def store_upload(file, upload, content_type=nil) - path = get_path_for_upload(file, upload) + path = get_path_for_upload(upload) store_file(file, path, filename: upload.original_filename, content_type: content_type, cache_locally: true) end def store_optimized_image(file, optimized_image) - path = get_path_for_optimized_image(file, optimized_image) + path = get_path_for_optimized_image(optimized_image) store_file(file, path) end @@ -94,19 +94,6 @@ module FileStore private - def get_path_for_upload(file, upload) - get_path_for("original".freeze, upload.sha1, upload.extension) - end - - def get_path_for_optimized_image(file, optimized_image) - extension = "_#{optimized_image.width}x#{optimized_image.height}#{optimized_image.extension}" - get_path_for("optimized".freeze, optimized_image.sha1, extension) - end - - def get_path_for(type, sha, extension) - "#{type}/#{sha[0]}/#{sha[1]}/#{sha}#{extension}" - end - # options # - filename # - content_type diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 33403f154c8..916608de74c 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -118,7 +118,7 @@ describe CookedPostProcessor do it "generates overlay information" do cpp.post_process_images - expect(cpp.html).to match_html '
+ expect(cpp.html).to match_html '
logo.png1000x2000 1.21 KB
' expect(cpp).to be_dirty @@ -145,7 +145,7 @@ describe CookedPostProcessor do it "generates overlay information" do cpp.post_process_images - expect(cpp.html).to match_html '
+ expect(cpp.html).to match_html '
WAT1000x2000 1.21 KB
' expect(cpp).to be_dirty diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index ee4693726d0..24bc176be28 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -309,7 +309,7 @@ This is a link http://example.com" receiver.process expect(topic.posts.count).to eq(start_count + 1) - expect(topic.posts.last.cooked).to match // + expect(topic.posts.last.cooked).to match // expect(Upload.find_by(sha1: upload_sha)).not_to eq(nil) end diff --git a/spec/components/file_store/local_store_spec.rb b/spec/components/file_store/local_store_spec.rb index f72ebdf280d..b30e397d4ba 100644 --- a/spec/components/file_store/local_store_spec.rb +++ b/spec/components/file_store/local_store_spec.rb @@ -5,20 +5,18 @@ describe FileStore::LocalStore do let(:store) { FileStore::LocalStore.new } - let(:upload) { build(:upload) } + let(:upload) { Fabricate(:upload) } let(:uploaded_file) { file_from_fixtures("logo.png") } - let(:optimized_image) { build(:optimized_image) } + let(:optimized_image) { Fabricate(:optimized_image) } - let(:avatar) { build(:upload) } + let(:avatar) { Fabricate(:upload) } describe ".store_upload" do it "returns a relative url" do - Time.stubs(:now).returns(Time.utc(2013, 2, 17, 12, 0, 0, 0)) - upload.stubs(:id).returns(42) store.expects(:copy_file) - expect(store.store_upload(uploaded_file, upload)).to eq("/uploads/default/original/e/9/e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98.png") + expect(store.store_upload(uploaded_file, upload)).to eq("/uploads/default/original/2X/e/e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98.png") end end @@ -27,7 +25,7 @@ describe FileStore::LocalStore do it "returns a relative url" do store.expects(:copy_file) - expect(store.store_optimized_image({}, optimized_image)).to eq("/uploads/default/optimized/8/6/86f7e437faa5a7fce15d1ddcb9eaeaea377667b8_100x200.png") + expect(store.store_optimized_image({}, optimized_image)).to eq("/uploads/default/optimized/2X/e/e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98_#{OptimizedImage::VERSION}_100x200.png") end end diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb index 2f56bafe68a..a98847839ba 100644 --- a/spec/components/file_store/s3_store_spec.rb +++ b/spec/components/file_store/s3_store_spec.rb @@ -7,13 +7,13 @@ describe FileStore::S3Store do let(:s3_helper) { stub } let(:store) { FileStore::S3Store.new(s3_helper) } - let(:upload) { build(:upload) } + let(:upload) { Fabricate(:upload) } let(:uploaded_file) { file_from_fixtures("logo.png") } - let(:optimized_image) { build(:optimized_image) } + let(:optimized_image) { Fabricate(:optimized_image) } let(:optimized_image_file) { file_from_fixtures("logo.png") } - let(:avatar) { build(:upload) } + let(:avatar) { Fabricate(:upload) } before(:each) do SiteSetting.stubs(:s3_upload_bucket).returns("S3_Upload_Bucket") @@ -24,10 +24,8 @@ describe FileStore::S3Store do describe ".store_upload" do it "returns an absolute schemaless url" do - upload.stubs(:id).returns(42) - upload.stubs(:extension).returns(".png") s3_helper.expects(:upload) - expect(store.store_upload(uploaded_file, upload)).to eq("//s3_upload_bucket.s3.amazonaws.com/original/e/9/e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98.png") + expect(store.store_upload(uploaded_file, upload)).to eq("//s3_upload_bucket.s3.amazonaws.com/original/2X/e/e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98.png") end end @@ -35,9 +33,8 @@ describe FileStore::S3Store do describe ".store_optimized_image" do it "returns an absolute schemaless url" do - optimized_image.stubs(:id).returns(42) s3_helper.expects(:upload) - expect(store.store_optimized_image(optimized_image_file, optimized_image)).to eq("//s3_upload_bucket.s3.amazonaws.com/optimized/8/6/86f7e437faa5a7fce15d1ddcb9eaeaea377667b8_100x200.png") + expect(store.store_optimized_image(optimized_image_file, optimized_image)).to eq("//s3_upload_bucket.s3.amazonaws.com/optimized/2X/e/e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98_#{OptimizedImage::VERSION}_100x200.png") end end