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

deviantart: fix non-downloadable flash files

Browse Source
This commit is contained in:
lllusion3469
2020-05-11 00:55:06 +02:00
parent 46e9f2dede
commit 0d5e31868f
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/sources/strategies/deviant_art.rb
View File

@@ -88,6 +88,8 @@ module Sources
url url
elsif api_deviation[:is_downloadable] elsif api_deviation[:is_downloadable]
api_download[:src] api_download[:src]
elsif api_deviation[:flash].present?
api_deviation.dig(:flash, :src)
else else
src = api_deviation.dig(:content, :src) src = api_deviation.dig(:content, :src)
if deviation_id && deviation_id.to_i <= 790677560 && src =~ /^https:\/\/images-wixmp-/ && src !~ /\.gif\?/ if deviation_id && deviation_id.to_i <= 790677560 && src =~ /^https:\/\/images-wixmp-/ && src !~ /\.gif\?/

10
test/unit/sources/deviant_art_test.rb
View File

@@ -254,6 +254,16 @@ module Sources
end end
end end
context "The source for a non-downloadable flash file" do
should "return working image url" do
@site = Sources::Strategies.find("https://www.deviantart.com/heartgear/art/SL-40v3-522007633")
# md5: 6adf1a3d532f898f44cf9948cbc7db7d
assert_match(%r!\Ahttps://api-da\.wixmp\.com/_api/download/file\?downloadToken=!, @site.image_url)
assert_downloaded(3_496_110, @site.image_url)
end
end
context "The source for an DeviantArt artwork page" do context "The source for an DeviantArt artwork page" do
setup do setup do
@site = Sources::Strategies.find("http://noizave.deviantart.com/art/test-post-please-ignore-685436408") @site = Sources::Strategies.find("http://noizave.deviantart.com/art/test-post-please-ignore-685436408")