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

fix: url normalization for non-project artist subdomains (maybe fixes #4021)

Browse Source
This commit is contained in:
Albert Yi
2018-12-19 15:07:32 -08:00
parent 372338e0e5
commit ca7c56f95f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,10 @@ module Sources::Strategies
PROJECT1 = %r!\Ahttps?://www\.artstation\.com/artwork/(?<project_id>[a-z0-9-]+)/?\z!i PROJECT1 = %r!\Ahttps?://www\.artstation\.com/artwork/(?<project_id>[a-z0-9-]+)/?\z!i
PROJECT2 = %r!\Ahttps?://(?<artist_name>[a-z0-9-]+)\.artstation\.com/projects/(?<project_id>[a-z0-9-]+)/?\z!i PROJECT2 = %r!\Ahttps?://(?<artist_name>[a-z0-9-]+)\.artstation\.com/projects/(?<project_id>[a-z0-9-]+)/?\z!i
PROJECT = Regexp.union(PROJECT1, PROJECT2) PROJECT = Regexp.union(PROJECT1, PROJECT2)
ARTIST1 = %r!\Ahttps?://(?<artist_name>[a-z0-9-]+)\.artstation\.com!
ARTIST2 = %r!\Ahttps?://www\.artstation\.com/artist/(?<artist_name>[a-z0-9-]+)!
ARTIST3 = %r!\Ahttps?://www\.artstation\.com/(?<artist_name>[a-z0-9-]+)!
ARTIST = Regexp.union(ARTIST1, ARTIST2, ARTIST3)
ASSET = %r!\Ahttps?://cdn\w*\.artstation\.com/p/assets/images/images/\d+/\d+/\d+/(?:medium|small|large)/!i ASSET = %r!\Ahttps?://cdn\w*\.artstation\.com/p/assets/images/images/\d+/\d+/\d+/(?:medium|small|large)/!i
@@ -96,7 +100,8 @@ module Sources::Strategies
# purposes # purposes
def artist_name_from_url def artist_name_from_url
urls.map { |url| url[PROJECT, :artist_name] }.compact.first urls.map { |url| url[PROJECT, :artist_name] }.compact.first ||
(urls.map { |url| url[ARTIST, :artist_name] }.compact - ["www"]).first
end end
def project_id def project_id