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

Fix #5363: Inconsistent order of files from zip uploads.

Browse Source 
Upload files in natural order rather than archive order when uploading archive files.

Before files were listed in the same order they appeared in the zip file. This could be in
non-alphabetical order, or even with files from different directories interleaved between each
other. Now files are uploaded in natural order, which is alphabetical order but with numbers sorted
properly, so that `file-9.jpg` appears before `file-10.jpg`.
This commit is contained in:
evazion
2022-12-02 17:57:52 -06:00
parent c19fc16885
commit d7d3427488
5 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/functional/uploads_controller_test.rb
View File

@@ -445,6 +445,19 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
assert_equal(5, upload.upload_media_assets.size)
assert_equal("file://ugoira.zip/000000.jpg", upload.upload_media_assets[0].source_url)
end
should "upload the files in filename order" do
upload = assert_successful_upload("test/files/archive/out-of-order.zip", user: @user)
assert_equal(6, upload.media_asset_count)
assert_equal(6, upload.upload_media_assets.size)
assert_equal("file://out-of-order.zip/9/9.gif", upload.upload_media_assets[0].source_url)
assert_equal("file://out-of-order.zip/9/10.gif", upload.upload_media_assets[1].source_url)
assert_equal("file://out-of-order.zip/9/11.gif", upload.upload_media_assets[2].source_url)
assert_equal("file://out-of-order.zip/10/9.gif", upload.upload_media_assets[3].source_url)
assert_equal("file://out-of-order.zip/10/10.gif", upload.upload_media_assets[4].source_url)
assert_equal("file://out-of-order.zip/10/11.gif", upload.upload_media_assets[5].source_url)
end
end
context "uploading a .rar file from your computer" do