jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

storage manager: remove hierarchical option.

Browse Source 
Remove the `hierarchical` file storage option. This means that image
files are always stored in MD5-based subdirectories, like this:

   https://danbooru.donmai.us/data/original/f3/a7/f3a70a89c350b5ed4db22dbb25b934bb.jpg
   https://danbooru.donmai.us/data/sample/f3/a7/sample-f3a70a89c350b5ed4db22dbb25b934bb.jpg
   https://danbooru.donmai.us/data/preview/f3/a7/f3a70a89c350b5ed4db22dbb25b934bb.jpg

instead of in a single flat directory, like this:

   https://danbooru.donmai.us/data/original/f3a70a89c350b5ed4db22dbb25b934bb.jpg

This option is removed because storing files in a single directory is a
bad idea for large installations, and migrating from a single directory
to subdirectories later is a pain.

Downstream boorus who still have files in the old layout can migrate by
running this script:

   `./script/fixes/077_symlink_subdirectories.rb`

This will create symlinks that redirect the 00-ff subdirectories back to
the current directory, so that you can still store files in a single
directory, but use URLs containing subdirectories.

You should also make sure to remove the `hierarchical` option from
`storage_manager` in `config/danbooru_local_config.rb` if you set it
there.
This commit is contained in:
evazion
2021-03-17 00:01:01 -05:00
parent a620a71b59
commit 29d2e7fed2
7 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/unit/post_test.rb
View File

@@ -1972,14 +1972,14 @@ class PostTest < ActiveSupport::TestCase
context "URLs:" do
should "generate the correct urls for animated gifs" do
manager = StorageManager::Local.new(base_url: "https://test.com/data")
manager = StorageManager::Local.new(base_url: "https://test.com/data", base_dir: "/")
Danbooru.config.stubs(:storage_manager).returns(manager)
@post = build(:post, md5: "deadbeef", file_ext: "gif", tag_string: "animated_gif")
assert_equal("https://test.com/data/preview/deadbeef.jpg", @post.preview_file_url)
assert_equal("https://test.com/data/deadbeef.gif", @post.large_file_url)
assert_equal("https://test.com/data/deadbeef.gif", @post.file_url)
assert_equal("https://test.com/data/preview/de/ad/deadbeef.jpg", @post.preview_file_url)
assert_equal("https://test.com/data/original/de/ad/deadbeef.gif", @post.large_file_url)
assert_equal("https://test.com/data/original/de/ad/deadbeef.gif", @post.file_url)
end
end