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

tumblr: fix failure to upload certain video posts.

Browse Source 
Fix failure to upload Tumblr video posts that contained a video URL of this form:

* https://va.media.tumblr.com/tumblr_rjoh0hR8Xe1teimlz_720.mp4
This commit is contained in:
evazion
2022-10-13 19:57:48 -05:00
parent a07234121d
commit 268ec9118a
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/logical/source/extractor/tumblr.rb
View File

@@ -29,7 +29,8 @@ class Source::Extractor
end end
assets += inline_images assets += inline_images
assets.map { |url| find_largest(url) } assets = assets.map { |url| find_largest(url) }
assets.compact
end end
def page_url def page_url
@@ -92,9 +93,8 @@ class Source::Extractor
if parsed_image.full_image_url.present? if parsed_image.full_image_url.present?
image_url_html(parsed_image.full_image_url)&.at("img[src*='/#{parsed_image.directory}/']")&.[](:src) image_url_html(parsed_image.full_image_url)&.at("img[src*='/#{parsed_image.directory}/']")&.[](:src)
elsif parsed_image.variants.present? elsif parsed_image.variants.present?
# Look for the biggest available version on media.tumblr.com. A bigger # Look for the biggest available version on media.tumblr.com. A bigger version may or may not exist.
# version may or may not exist. parsed_image.variants.find { |variant| http_exists?(variant) } || image_url
parsed_image.variants.find { |variant| http_exists?(variant) }
else else
parsed_image.original_url parsed_image.original_url
end end

11
app/logical/source/url/tumblr.rb
View File

@@ -123,12 +123,19 @@ class Source::URL::Tumblr < Source::URL
subdomain&.ends_with?(".media") || subdomain&.in?(%w[data media]) subdomain&.ends_with?(".media") || subdomain&.in?(%w[data media])
end end
def video_url?
# https://va.media.tumblr.com/tumblr_rjoh0hR8Xe1teimlz_720.mp4
image_url? && file_ext.in?(%w[mp4 webm])
end
def variants def variants
return [] unless @sample_size.present? && @filename.present? return [] unless @sample_size.present? && @filename.present?
directory = "#{@directory}/" if @directory.present? directory = "#{@directory}/" if @directory.present?
sizes = %w[1280 640 540 500h 500 400 250 100] media_host = video_url? ? "va.media.tumblr.com" : "media.tumblr.com"
sizes.map { |size| "https://media.tumblr.com/#{directory}#{@filename}_#{size}.#{file_ext}" } sizes = %w[1280 720 640 540 500h 500 400 250 100]
sizes.map { |size| "https://#{media_host}/#{directory}#{@filename}_#{size}.#{file_ext}" }
end end
def page_url def page_url

8
test/unit/sources/tumblr_test.rb
View File

@@ -96,6 +96,14 @@ module Sources
) )
end end
context "A video post with a https://va.media.tumblr.com/tumblr_*_720.mp4 URL" do
strategy_should_work(
"https://cloudstation.tumblr.com/post/697975577362251776/direct-quote-from-kaiba-post-battle-city",
image_urls: ["https://va.media.tumblr.com/tumblr_rjoh0hR8Xe1teimlz_720.mp4"],
download_size: 1_073_148,
)
end
context "The source for a 'http://*.tumblr.com/post/*' answer post with inline images" do context "The source for a 'http://*.tumblr.com/post/*' answer post with inline images" do
strategy_should_work( strategy_should_work(
"https://noizave.tumblr.com/post/171237880542/test-ask", "https://noizave.tumblr.com/post/171237880542/test-ask",