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

include default referer url for art station strategy

Browse Source
This commit is contained in:
r888888888
2017-02-06 17:11:25 -08:00
parent 39b6601afe
commit 9996030496
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/logical/downloads/rewrite_strategies/art_station.rb
View File

@@ -5,12 +5,20 @@ module Downloads
# example: https://cdnb3.artstation.com/p/assets/images/images/003/716/071/large/aoi-ogata-hate-city.jpg?1476754974 # example: https://cdnb3.artstation.com/p/assets/images/images/003/716/071/large/aoi-ogata-hate-city.jpg?1476754974
if url =~ %r!^https?://cdn\w*\.artstation\.com/p/assets/images/images/\d+/\d+/\d+/(?:medium|small|large)/! if url =~ %r!^https?://cdn\w*\.artstation\.com/p/assets/images/images/\d+/\d+/\d+/(?:medium|small|large)/!
url, headers = rewrite_large_url(url, headers) url, headers = rewrite_large_url(url, headers)
elsif url =~ %r!https?://\w+\.artstation\.com/artwork/!
url, headers = rewrite_html_url(url, headers)
end end
return [url, headers, data] return [url, headers, data]
end end
protected protected
def rewrite_html_url(url, headers)
source = Sources::Site.new(url)
source.get
[source.image_url, headers]
end
def rewrite_large_url(url, headers) def rewrite_large_url(url, headers)
# example: https://cdnb3.artstation.com/p/assets/images/images/003/716/071/original/aoi-ogata-hate-city.jpg?1476754974 # example: https://cdnb3.artstation.com/p/assets/images/images/003/716/071/original/aoi-ogata-hate-city.jpg?1476754974
url = url.sub(%r!/(?:medium|small|large)/!, "/original/") url = url.sub(%r!/(?:medium|small|large)/!, "/original/")

11
app/logical/sources/strategies/art_station.rb
View File

@@ -7,10 +7,11 @@ module Sources::Strategies
end end
def referer_url def referer_url
end if @referer_url =~ %r!^https?://\w+\.artstation\.com/artwork/[a-z0-9]+!i
@referer_url
def tags else
json["categories"].map {|x| x["name"].downcase.tr(" ", "_")} @url
end
end end
def site_name def site_name
@@ -38,7 +39,7 @@ module Sources::Strategies
y, _, _ = image_url_rewriter.rewrite(x["image_url"], nil) y, _, _ = image_url_rewriter.rewrite(x["image_url"], nil)
y y
end end
@tags = json["categories"].map {|x| x["name"].downcase.tr(" ", "_")} if json["categories"] @tags = json["tags"].map {|x| [x.downcase.tr(" ", "_"), "https://www.artstation.com/search?q=" + CGI.escape(x)]} if json["tags"]
@artist_commentary_title = json["title"] @artist_commentary_title = json["title"]
@artist_commentary_desc = ActionView::Base.full_sanitizer.sanitize(json["description"]) @artist_commentary_desc = ActionView::Base.full_sanitizer.sanitize(json["description"])
else else