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

normalize_for_artist_finder!: Don't crash on bad URLs

Browse Source 
If we can't normalize the URL (because of bad IDs, it's malformed, or
the HTML page changed), just return the unnormalized URL.
This commit is contained in:
evazion
2014-10-05 12:13:38 -05:00
parent dcbe061809
commit c75d2d208e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/logical/sources/strategies/pixiv.rb
View File

@@ -149,7 +149,7 @@ module Sources
if not stacc_link.nil?
stacc_link.attr("href").sub(%r!^/stacc/!i, '')
else
raise "Couldn't find Pixiv moniker in page: #{normalized_url}"
raise Sources::Error.new("Couldn't find Pixiv moniker in page: #{normalized_url}")
end
end
@@ -162,7 +162,7 @@ module Sources
thumbnail_url = elements.first.attr("src")
return rewrite_thumbnails(thumbnail_url, is_manga)
else
raise "Couldn't find image thumbnail URL in page: #{normalized_url}"
raise Sources::Error.new("Couldn't find image thumbnail URL in page: #{normalized_url}")
end
end
@@ -217,7 +217,7 @@ module Sources
metadata = CSV.parse(response.content.force_encoding("UTF-8")).first
if metadata.nil?
raise "Couldn't get Pixiv API metadata from #{spapi_url}."
raise Sources::Error.new("Couldn't get Pixiv API metadata from #{spapi_url}.")
else
yield metadata
end
@@ -255,7 +255,7 @@ module Sources
$1
else
raise "Couldn't get illust ID from URL: #{url}"
raise Sources::Error.new("Couldn't get illust ID from URL: #{url}")
end
end