From af4708dde9d4f074ea671ce469275b13efbbb4cd Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 3 Apr 2017 00:57:00 -0500 Subject: [PATCH 1/2] Fix typo in i.pximg.net download strategy. --- app/logical/downloads/rewrite_strategies/pixiv.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/logical/downloads/rewrite_strategies/pixiv.rb b/app/logical/downloads/rewrite_strategies/pixiv.rb index 0c74562f2..f7d47f5ed 100644 --- a/app/logical/downloads/rewrite_strategies/pixiv.rb +++ b/app/logical/downloads/rewrite_strategies/pixiv.rb @@ -8,12 +8,12 @@ module Downloads end def rewrite(url, headers, data = {}) - if url =~ /\Ahttps?:\/\/(?:\w+\.)?pixiv\.net/ || url =~ /\Ahttps:\/\/i\.pximg\.net/ + if url =~ /\Ahttps?:\/\/(?:\w+\.)?pixiv\.net/ || url =~ /\Ahttps?:\/\/i\.pximg\.net/ url, headers = rewrite_headers(url, headers) url, headers = rewrite_cdn(url, headers) end - if (url =~ /\Ahttps?:\/\/(?:\w+\.)?pixiv\.net/ || url =~ /\Ahttps:?\/\/i\.pximg\.net/) && source.illust_id_from_url + if (url =~ /\Ahttps?:\/\/(?:\w+\.)?pixiv\.net/ || url =~ /\Ahttps?:\/\/i\.pximg\.net/) && source.illust_id_from_url url, headers = rewrite_html_pages(url, headers) url, headers = rewrite_thumbnails(url, headers) url, headers = rewrite_old_small_manga_pages(url, headers) From 4b138be6b961896a80e8ba46227d98d79751e2b4 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 3 Apr 2017 02:01:06 -0500 Subject: [PATCH 2/2] Rewrite i.pximg.net manga gallery samples. --- app/logical/sources/strategies/pixiv.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb index 185a4dfc2..281a3734c 100644 --- a/app/logical/sources/strategies/pixiv.rb +++ b/app/logical/sources/strategies/pixiv.rb @@ -160,8 +160,12 @@ module Sources # http://i1.pixiv.net/c/600x600/img-master/img/2014/10/02/13/51/23/46304396_p1_master1200.jpg # => http://i1.pixiv.net/img-original/img/2014/10/02/13/51/23/46304396_p1.png + # + # http://i.pximg.net/img-master/img/2014/05/15/23/53/59/43521009_p1_master1200.jpg + # => http://i.pximg.net/img-original/img/2014/05/15/23/53/59/43521009_p1.jpg def rewrite_new_medium_images(thumbnail_url) - if thumbnail_url =~ %r!/c/\d+x\d+/img-master/img/#{TIMESTAMP}/\d+_p\d+_\w+\.jpg!i + if thumbnail_url =~ %r!/c/\d+x\d+/img-master/img/#{TIMESTAMP}/\d+_p\d+_\w+\.jpg!i || + thumbnail_url =~ %r!/img-master/img/#{TIMESTAMP}/\d+_p\d+_\w+\.jpg!i page = manga_page_from_url(@url).to_i thumbnail_url = @metadata.pages[page] end @@ -381,6 +385,9 @@ module Sources # http://i2.pixiv.net/c/64x64/img-master/img/2014/10/09/12/59/50/46441917_square1200.jpg return true if url =~ %r!#{I12}/c/\d+x\d+/img-master/img/#{TIMESTAMP}/\d+_\w+\.#{EXT}$!i + # http://i.pximg.net/img-master/img/2014/05/15/23/53/59/43521009_p1_master1200.jpg + return true if url =~ %r!#{PXIMG}/img-master/img/#{TIMESTAMP}/\d+_\w+\.#{EXT}!i + # http://i.pximg.net/c/600x600/img-master/img/2017/03/22/17/40/51/62041488_p0_master1200.jpg return true if url =~ %r!#{PXIMG}/c/\d+x\d+/img-master/img/#{TIMESTAMP}/\d+_\w+\.#{EXT}!i