From 37fc215d75f69138671f97f8b2638a5e00915863 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 11 Sep 2018 23:55:46 -0500 Subject: [PATCH] pixiv: fix preview_urls to use correct url (#3891). --- app/logical/sources/strategies/pixiv.rb | 5 ++++- test/unit/sources/pixiv_test.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb index e44950461..cedf953c7 100644 --- a/app/logical/sources/strategies/pixiv.rb +++ b/app/logical/sources/strategies/pixiv.rb @@ -12,6 +12,7 @@ module Sources IMG = %r!(?:\A(?:https?://)?img[0-9]*\.pixiv\.net)! PXIMG = %r!(?:\A(?:https?://)?i\.pximg\.net)! TOUCH = %r!(?:\A(?:https?://)?touch\.pixiv\.net)! + ORIG_IMAGE = %r!#{PXIMG}/img-original/img/(?\d{4}/\d{2}/\d{2}/\d{2}/\d{2}/\d{2})/(?\d+)_p(?\d+)\.#{EXT}\z!i STACC_PAGE = %r!\A#{WEB}/stacc/#{MONIKER}/?\z!i NOVEL_PAGE = %r!(?:\Ahttps?://www\.pixiv\.net/novel/show\.php\?id=(\d+))! FANBOX_ACCOUNT = %r!(?:\Ahttps?://www\.pixiv\.net/fanbox/creator/\d+\z)! @@ -52,7 +53,9 @@ module Sources def preview_urls image_urls.map do |x| - x.sub(%r!pximg\.net/img-original/img!, "pximg.net/c/240x240/img-master/img") + x.sub(ORIG_IMAGE) do + "https://i.pximg.net/c/240x240/img-master/img/#{$~[:date]}/#{$~[:illust_id]}_p#{$~[:page]}_master1200.jpg" + end end end diff --git a/test/unit/sources/pixiv_test.rb b/test/unit/sources/pixiv_test.rb index 7cdfc41d0..38540da2b 100644 --- a/test/unit/sources/pixiv_test.rb +++ b/test/unit/sources/pixiv_test.rb @@ -103,7 +103,7 @@ module Sources end should "get the preview size image url" do - assert_equal("https://i.pximg.net/c/240x240/img-master/img/2017/11/21/05/12/37/65981735_p0.jpg", @site.preview_url) + assert_equal("https://i.pximg.net/c/240x240/img-master/img/2017/11/21/05/12/37/65981735_p0_master1200.jpg", @site.preview_url) end should "get the page count" do