diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb index 786c704f4..da3b7ce7a 100644 --- a/app/logical/sources/strategies/pixiv.rb +++ b/app/logical/sources/strategies/pixiv.rb @@ -1,6 +1,7 @@ # Pixiv # # * https://i.pximg.net/img-original/img/2014/10/03/18/10/20/46324488_p0.png +# * https://i-f.pximg.net/img-original/img/2020/02/19/00/40/18/79584713_p0.png # # * https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/10/29/09/27/19/46785915_p0_square1200.jpg # * https://i.pximg.net/img-master/img/2014/10/03/18/10/20/46324488_p0_master1200.jpg @@ -55,7 +56,7 @@ module Sources WEB = %r!(?:\A(?:https?://)?www\.pixiv\.net)! I12 = %r!(?:\A(?:https?://)?i[0-9]+\.pixiv\.net)! IMG = %r!(?:\A(?:https?://)?img[0-9]*\.pixiv\.net)! - PXIMG = %r!(?:\A(?:https?://)?i\.pximg\.net)! + PXIMG = %r!(?:\A(?:https?://)?[^.]+\.pximg\.net)! TOUCH = %r!(?:\A(?:https?://)?touch\.pixiv\.net)! UGOIRA = %r!#{PXIMG}/img-zip-ugoira/img/#{DATE}/(?\d+)_ugoira1920x1080\.zip\z!i ORIG_IMAGE = %r!#{PXIMG}/img-original/img/#{DATE}/(?\d+)_p(?\d+)\.#{EXT}\z!i @@ -294,12 +295,13 @@ module Sources # http://i1.pixiv.net/img-zip-ugoira/img/2014/10/03/17/29/16/46323924_ugoira1920x1080.zip # https://i.pximg.net/img-original/img/2014/10/03/18/10/20/46324488_p0.png # https://i.pximg.net/img-master/img/2014/10/03/18/10/20/46324488_p0_master1200.jpg + # https://i-f.pximg.net/img-original/img/2020/02/19/00/40/18/79584713_p0.png # # but not: # # https://i.pximg.net/novel-cover-original/img/2019/01/14/01/15/05/10617324_d84daae89092d96bbe66efafec136e42.jpg # https://img-sketch.pixiv.net/uploads/medium/file/4463372/8906921629213362989.jpg - elsif url.host =~ %r!\A(?:i\.pximg\.net|i\d+\.pixiv\.net)\z!i && + elsif url.host =~ %r!\A(?:[^.]+\.pximg\.net|i\d+\.pixiv\.net)\z!i && url.path =~ %r!\A(/c/\w+)?/img-[a-z-]+/img/#{DATE}/(?\d+)(?:_\w+)?\.(?:jpg|jpeg|png|gif|zip)!i return $~[:illust_id].to_i end diff --git a/test/unit/sources/pixiv_test.rb b/test/unit/sources/pixiv_test.rb index 9b11a2dd9..fa4b3da94 100644 --- a/test/unit/sources/pixiv_test.rb +++ b/test/unit/sources/pixiv_test.rb @@ -39,7 +39,7 @@ module Sources end should "get all the image urls" do - assert_equal(["https://i.pximg.net/img-original/img/2015/03/14/17/53/32/49270482_p0.jpg", "https://i.pximg.net/img-original/img/2015/03/14/17/53/32/49270482_p1.jpg"], @image_urls) + assert_equal(["https://i-f.pximg.net/img-original/img/2015/03/14/17/53/32/49270482_p0.jpg", "https://i-f.pximg.net/img-original/img/2015/03/14/17/53/32/49270482_p1.jpg"], @image_urls) end end @@ -49,7 +49,7 @@ module Sources end should "get the file url" do - assert_equal("https://i.pximg.net/img-zip-ugoira/img/2017/04/04/08/57/38/62247364_ugoira1920x1080.zip", @site.file_url) + assert_equal("https://i-f.pximg.net/img-zip-ugoira/img/2017/04/04/08/57/38/62247364_ugoira1920x1080.zip", @site.file_url) end should "get the preview url" do @@ -89,12 +89,12 @@ module Sources should "work" do @site = Sources::Strategies.find("https://www.pixiv.net/en/artworks/64476642") - assert_equal("https://i.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.image_url) - assert_equal("https://i.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.canonical_url) + assert_equal("https://i-f.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.image_url) + assert_equal("https://i-f.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.canonical_url) assert_equal("https://www.pixiv.net/artworks/64476642", @site.page_url) @site = Sources::Strategies.find("https://www.pixiv.net/artworks/64476642") - assert_equal("https://i.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.image_url) + assert_equal("https://i-f.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.image_url) assert_equal("https://www.pixiv.net/artworks/64476642", @site.page_url) end end @@ -113,7 +113,7 @@ module Sources end should "get the full size image url" do - assert_equal("https://i.pximg.net/img-original/img/2017/11/21/05/12/37/65981735_p0.jpg", @site.image_url) + assert_equal("https://i-f.pximg.net/img-original/img/2017/11/21/05/12/37/65981735_p0.jpg", @site.image_url) end should "get the preview size image url" do @@ -156,7 +156,7 @@ module Sources end should "get the full size image url" do - assert_equal("https://i.pximg.net/img-original/img/2014/10/29/09/27/19/46785915_p0.jpg", @site.image_url) + assert_equal("https://i-f.pximg.net/img-original/img/2014/10/29/09/27/19/46785915_p0.jpg", @site.image_url) end end @@ -170,11 +170,11 @@ module Sources end should "get the full size image url" do - assert_equal("https://i.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.image_url) + assert_equal("https://i-f.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.image_url) end should "get the full size image url for the canonical url" do - assert_equal("https://i.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.canonical_url) + assert_equal("https://i-f.pximg.net/img-original/img/2017/08/18/00/09/21/64476642_p0.jpg", @site.canonical_url) end end @@ -311,6 +311,7 @@ module Sources assert_illust_id(46324488, "https://i.pximg.net/img-master/img/2014/10/03/18/10/20/46324488_p0_master1200.jpg") assert_illust_id(46785915, "https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/10/29/09/27/19/46785915_p0_square1200.jpg") + assert_illust_id(79584713, "https://i-f.pximg.net/img-original/img/2020/02/19/00/40/18/79584713_p0.png") assert_illust_id(46323924, "http://i1.pixiv.net/img-zip-ugoira/img/2014/10/03/17/29/16/46323924_ugoira1920x1080.zip") assert_illust_id(46304396, "http://i1.pixiv.net/img-original/img/2014/10/02/13/51/23/46304396_p0.png")