Reorganize rewrite strats slightly
This commit is contained in:
@@ -1,6 +1,12 @@
|
|||||||
module Downloads
|
module Downloads
|
||||||
module RewriteStrategies
|
module RewriteStrategies
|
||||||
class NicoSeiga < Base
|
class NicoSeiga < Base
|
||||||
|
attr_accessor :url, :source
|
||||||
|
|
||||||
|
def initialize(url)
|
||||||
|
@url = url
|
||||||
|
end
|
||||||
|
|
||||||
def rewrite(url, headers, data = {})
|
def rewrite(url, headers, data = {})
|
||||||
if url =~ %r{https?://lohas\.nicoseiga\.jp} || url =~ %r{https?://seiga\.nicovideo\.jp}
|
if url =~ %r{https?://lohas\.nicoseiga\.jp} || url =~ %r{https?://seiga\.nicovideo\.jp}
|
||||||
url, headers = rewrite_headers(url, headers)
|
url, headers = rewrite_headers(url, headers)
|
||||||
@@ -22,8 +28,6 @@ module Downloads
|
|||||||
# example: http://seiga.nicovideo.jp/seiga/im1389842
|
# example: http://seiga.nicovideo.jp/seiga/im1389842
|
||||||
|
|
||||||
if url =~ %r{https?://seiga\.nicovideo\.jp/seiga/im\d+}
|
if url =~ %r{https?://seiga\.nicovideo\.jp/seiga/im\d+}
|
||||||
source = ::Sources::Strategies::NicoSeiga.new(url)
|
|
||||||
source.get
|
|
||||||
return [source.image_url, headers]
|
return [source.image_url, headers]
|
||||||
else
|
else
|
||||||
return [url, headers]
|
return [url, headers]
|
||||||
@@ -32,8 +36,6 @@ module Downloads
|
|||||||
|
|
||||||
def rewrite_thumbnails(url, headers)
|
def rewrite_thumbnails(url, headers)
|
||||||
if url =~ %r{/thumb/\d+}
|
if url =~ %r{/thumb/\d+}
|
||||||
source = ::Sources::Strategies::NicoSeiga.new(url)
|
|
||||||
source.get
|
|
||||||
return [source.image_url, headers]
|
return [source.image_url, headers]
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -44,13 +46,21 @@ module Downloads
|
|||||||
# example: http://lohas.nicoseiga.jp/o/40aeedd2848a7780b6046747e75b3566b423a10c/1436307639/5026559
|
# example: http://lohas.nicoseiga.jp/o/40aeedd2848a7780b6046747e75b3566b423a10c/1436307639/5026559
|
||||||
|
|
||||||
if url =~ %r{http://lohas\.nicoseiga\.jp/o/}
|
if url =~ %r{http://lohas\.nicoseiga\.jp/o/}
|
||||||
source = ::Sources::Strategies::NicoSeiga.new(url)
|
|
||||||
source.get
|
|
||||||
return [source.image_url, headers]
|
return [source.image_url, headers]
|
||||||
else
|
else
|
||||||
return [url, headers]
|
return [url, headers]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Cache the source data so it gets fetched at most once.
|
||||||
|
def source
|
||||||
|
@source ||= begin
|
||||||
|
source = ::Sources::Strategies::NicoSeiga.new(url)
|
||||||
|
source.get
|
||||||
|
|
||||||
|
source
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
module Downloads
|
module Downloads
|
||||||
module RewriteStrategies
|
module RewriteStrategies
|
||||||
class Twitter < Base
|
class Twitter < Base
|
||||||
|
attr_accessor :url, :source
|
||||||
|
|
||||||
|
def initialize(url)
|
||||||
|
@url = url
|
||||||
|
end
|
||||||
|
|
||||||
def rewrite(url, headers, data = {})
|
def rewrite(url, headers, data = {})
|
||||||
if url =~ %r!^https?://(?:mobile\.)?twitter\.com!
|
if url =~ %r!^https?://(?:mobile\.)?twitter\.com!
|
||||||
url, headers = rewrite_status_page(url, headers, data)
|
url, headers = rewrite_status_page(url, headers, data)
|
||||||
@@ -13,7 +19,6 @@ module Downloads
|
|||||||
|
|
||||||
protected
|
protected
|
||||||
def rewrite_status_page(url, headers, data)
|
def rewrite_status_page(url, headers, data)
|
||||||
source = build_source(url)
|
|
||||||
url = source.image_url
|
url = source.image_url
|
||||||
data[:artist_commentary_desc] = source.artist_commentary_desc
|
data[:artist_commentary_desc] = source.artist_commentary_desc
|
||||||
return [url, headers, data]
|
return [url, headers, data]
|
||||||
@@ -27,9 +32,13 @@ module Downloads
|
|||||||
return [url, headers]
|
return [url, headers]
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_source(url)
|
# Cache the source data so it gets fetched at most once.
|
||||||
::Sources::Strategies::Twitter.new(url).tap do |x|
|
def source
|
||||||
x.get
|
@source ||= begin
|
||||||
|
source = ::Sources::Strategies::Twitter.new(url)
|
||||||
|
source.get
|
||||||
|
|
||||||
|
source
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user