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

uploads: allow uploading iso5 .mp4 files.

Browse Source 
This is an MP4 ftyp sometimes used by Twitter.
This commit is contained in:
evazion
2022-02-09 16:45:49 -06:00
parent 26d54c1e37
commit 58fc00e549
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/logical/media_file.rb
View File

@@ -60,10 +60,11 @@ class MediaFile
# https://www.ftyps.com
# isom (common) - MP4 Base Media v1 [IS0 14496-12:2003]
# mp42 (common) - MP4 v2 [ISO 14496-14]
# iso5 (rare) - MP4 Base Media v5 (used by Twitter)
# 3gp5 (rare) - 3GPP Media (.3GP) Release 5
# avc1 (rare) - MP4 Base w/ AVC ext [ISO 14496-12:2005]
# M4V (rare) - Apple iTunes Video (https://en.wikipedia.org/wiki/M4V)
when /\A....ftyp(?:isom|3gp5|mp42|avc1|M4V)/
when /\A....ftyp(?:isom|iso5|3gp5|mp42|avc1|M4V)/
:mp4
when /\APK\x03\x04/
:zip

BIN
test/files/test-iso5.mp4 Normal file
View File

Binary file not shown.

3
test/functional/uploads_controller_test.rb
View File

@@ -313,7 +313,8 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
should_upload_successfully("https://pbs.twimg.com/media/DCdZ_FhUIAAYKFN?format=jpg&name=medium")
should_upload_successfully("https://pbs.twimg.com/profile_banners/2371694594/1581832507/1500x500")
should_upload_successfully("https://twitter.com/zeth_total/status/1355597580814585856")
# XXX should_upload_successfully("https://video.twimg.com/tweet_video/EWHWVrmVcAAp4Vw.mp4")
should_upload_successfully("https://video.twimg.com/tweet_video/FLKI6DWakAQFRkC.mp4")
should_upload_successfully("https://video.twimg.com/tweet_video/EWHWVrmVcAAp4Vw.mp4")
should_upload_successfully("https://www.weibo.com/5501756072/J2UNKfbqV")
should_upload_successfully("https://wx1.sinaimg.cn/mw690/0060kO5aly1gezsyt5xvhj30ok0sgtc9.jpg")

4
test/unit/media_file_test.rb
View File

@@ -97,6 +97,10 @@ class MediaFileTest < ActiveSupport::TestCase
assert_equal(:mp4, MediaFile.open("test/files/test-audio.m4v").file_ext)
end
should "determine the correct extension for an iso5 mp4 file" do
assert_equal(:mp4, MediaFile.open("test/files/test-iso5.mp4").file_ext)
end
should "determine the correct extension for a ugoira file" do
assert_equal(:zip, MediaFile.open("test/files/ugoira.zip").file_ext)
end