Remove artist commentary handling from download rewrite strategies.
This commit is contained in:
@@ -11,8 +11,6 @@ module Downloads
|
||||
if url =~ %r{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)
|
||||
data[:artist_commentary_title] = source.artist_commentary_title
|
||||
data[:artist_commentary_desc] = source.artist_commentary_desc
|
||||
end
|
||||
|
||||
return [url, headers, data]
|
||||
|
||||
@@ -18,8 +18,6 @@ module Downloads
|
||||
url, headers = rewrite_thumbnails(url, headers)
|
||||
url, headers = rewrite_old_small_manga_pages(url, headers)
|
||||
url, headers = rewrite_to_thumbnails(url, headers) if data.delete(:get_thumbnail)
|
||||
data[:artist_commentary_title] = source.artist_commentary_title
|
||||
data[:artist_commentary_desc] = source.artist_commentary_desc
|
||||
end
|
||||
|
||||
# http://i2.pixiv.net/img-zip-ugoira/img/2014/08/05/06/01/10/44524589_ugoira1920x1080.zip
|
||||
|
||||
@@ -9,7 +9,7 @@ module Downloads
|
||||
|
||||
def rewrite(url, headers, data = {})
|
||||
if url =~ %r!^https?://(?:mobile\.)?twitter\.com!
|
||||
url, headers = rewrite_status_page(url, headers, data)
|
||||
url = source.image_url
|
||||
elsif url =~ %r{^https?://pbs\.twimg\.com}
|
||||
url, headers = rewrite_thumbnails(url, headers, data)
|
||||
end
|
||||
@@ -18,12 +18,6 @@ module Downloads
|
||||
end
|
||||
|
||||
protected
|
||||
def rewrite_status_page(url, headers, data)
|
||||
url = source.image_url
|
||||
data[:artist_commentary_desc] = source.artist_commentary_desc
|
||||
return [url, headers, data]
|
||||
end
|
||||
|
||||
def rewrite_thumbnails(url, headers, data)
|
||||
if url =~ %r{^(https?://pbs\.twimg\.com/media/[^:]+)}
|
||||
url = $1 + ":orig"
|
||||
|
||||
@@ -6,8 +6,8 @@ module Sources
|
||||
delegate :get, :get_size, :site_name, :artist_name,
|
||||
:profile_url, :image_url, :tags, :artist_record, :unique_id,
|
||||
:page_count, :file_url, :ugoira_frame_data, :ugoira_content_type, :image_urls,
|
||||
:has_artist_commentary?, :artist_commentary_title,
|
||||
:artist_commentary_desc, :rewrite_thumbnails, :illust_id_from_url, :to => :strategy
|
||||
:artist_commentary_title, :artist_commentary_desc,
|
||||
:rewrite_thumbnails, :illust_id_from_url, :to => :strategy
|
||||
|
||||
def self.strategies
|
||||
[Strategies::PixivWhitecube, Strategies::Pixiv, Strategies::NicoSeiga, Strategies::DeviantArt, Strategies::ArtStation, Strategies::Nijie, Strategies::Twitter, Strategies::Tumblr, Strategies::Pawoo]
|
||||
|
||||
@@ -53,11 +53,6 @@ module Sources
|
||||
false
|
||||
end
|
||||
|
||||
# Determines whether or not to automatically create an ArtistCommentary
|
||||
def has_artist_commentary?
|
||||
false
|
||||
end
|
||||
|
||||
def normalize_for_artist_finder!
|
||||
url
|
||||
end
|
||||
|
||||
@@ -41,10 +41,6 @@ module Sources
|
||||
"http://www.pixiv.net"
|
||||
end
|
||||
|
||||
def has_artist_commentary?
|
||||
@artist_commentary_desc.present?
|
||||
end
|
||||
|
||||
def normalized_for_artist_finder?
|
||||
url =~ %r!https?://img\.pixiv\.net/img/#{MONIKER}/?$!i
|
||||
end
|
||||
|
||||
@@ -26,10 +26,6 @@ module Sources
|
||||
"http://www.pixiv.net"
|
||||
end
|
||||
|
||||
def has_artist_commentary?
|
||||
@artist_commentary_desc.present?
|
||||
end
|
||||
|
||||
def normalizable_for_artist_finder?
|
||||
true
|
||||
end
|
||||
|
||||
@@ -30,10 +30,6 @@ module Sources::Strategies
|
||||
@artist_commentary_desc = attrs[:text]
|
||||
end
|
||||
|
||||
def has_artist_commentary?
|
||||
@artist_commentary_desc.present?
|
||||
end
|
||||
|
||||
def image_urls
|
||||
TwitterService.new.image_urls(url)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user