From f9b63702bfe93b2d0a0b7cc55afabdc481524758 Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Mon, 9 Jul 2018 16:47:59 -0700 Subject: [PATCH] support artist-path urls in deviant art rewrite strategy (#3771) --- app/logical/downloads/rewrite_strategies/deviant_art.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/logical/downloads/rewrite_strategies/deviant_art.rb b/app/logical/downloads/rewrite_strategies/deviant_art.rb index f9d2ec94a..4c2411b93 100644 --- a/app/logical/downloads/rewrite_strategies/deviant_art.rb +++ b/app/logical/downloads/rewrite_strategies/deviant_art.rb @@ -8,7 +8,7 @@ module Downloads end def rewrite(url, headers, data = {}) - if url =~ %r{deviantart\.com/art/} || url =~ %r{deviantart\.net/.+/[a-z0-9_]+(_by_[a-z0-9_]+)?-d([a-z0-9]+)\.}i + if url =~ %r{deviantart\.com/art/} || url =~ %r{\Ahttps?://www\.deviantart\.com/([^/]+)/art/} || url =~ %r{deviantart\.net/.+/[a-z0-9_]+(_by_[a-z0-9_]+)?-d([a-z0-9]+)\.}i url, headers = rewrite_html_pages(url, headers) url, headers = rewrite_thumbnails(url, headers) end @@ -18,7 +18,7 @@ module Downloads protected def rewrite_html_pages(url, headers) - if url =~ %r{^https?://.+?\.deviantart\.com/art/} + if url =~ %r{^https?://.+?\.deviantart\.com/art/} || url =~ %r{\Ahttps?://www\.deviantart\.com/([^/]+)/art/} return [source.image_url, headers] else return [url, headers]