From 3c6c40d4ed7bbf9cf29d3d4b9a2ac70d2094bfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 3 Jun 2025 19:38:25 +0200 Subject: [PATCH] [nijie] fix file extraction (#7624) ignore empty URLs / URLs with no 'src="' --- gallery_dl/extractor/nijie.py | 1 + test/results/horne.py | 16 ++++++++-------- test/results/nijie.py | 22 ++++++++++------------ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/gallery_dl/extractor/nijie.py b/gallery_dl/extractor/nijie.py index 658cb759..209a36ea 100644 --- a/gallery_dl/extractor/nijie.py +++ b/gallery_dl/extractor/nijie.py @@ -117,6 +117,7 @@ class NijieExtractor(AsynchronousMixin, BaseExtractor): text.extr(media, ' src="', '"') for media in text.extract_iter( page, 'href="javascript:void(0);"><', '>') + if ' src="' in media ] else: pos = page.find('id="view-center"') + 1 diff --git a/test/results/horne.py b/test/results/horne.py index f6bddba8..11b804f6 100644 --- a/test/results/horne.py +++ b/test/results/horne.py @@ -23,7 +23,7 @@ __tests__ = ( "#url" : "https://horne.red/members_illust.php?id=58000", "#category": ("Nijie", "horne", "illustration"), "#class" : nijie.NijieIllustrationExtractor, - "#pattern" : r"https://pic\.nijie\.net/\d+/horne/\w+/\d+/\d+/illust/\d+_\d+_[0-9a-f]+_[0-9a-f]+\.png", + "#pattern" : r"https://pic\.nijie\.net/__s4__/[0-9a-f]{184}\.png", "#range" : "1-20", "#count" : 20, @@ -79,7 +79,7 @@ __tests__ = ( "#url" : "https://horne.red/view.php?id=8708", "#category": ("Nijie", "horne", "image"), "#class" : nijie.NijieImageExtractor, - "#urls" : "https://pic.nijie.net/07/horne/18/00/58000/illust/0_0_c8f715a8f3d53943_db6231.png", + "#urls" : "https://pic.nijie.net/__s4__/d7e18cb679f35b388dc8b0b9f2edb178078469b8970ee099cd573a577bc3a84cf33a04581f20b1cbed44bcd86147348cccdf7ded3b974bfb5b2711c2afb27c67834a22bd7411aa43895c9f480bbbed7373d345c24ac55e36018ad065.png", "artist_id" : 58000, "artist_name": "のえるわ", @@ -87,7 +87,7 @@ __tests__ = ( "date" : "dt:2018-01-29 14:25:39", "description": "前回とシチュがまるかぶり　\r\n竿野郎は塗るのだるかった", "extension" : "png", - "filename" : "0_0_c8f715a8f3d53943_db6231", + "filename" : "d7e18cb679f35b388dc8b0b9f2edb178078469b8970ee099cd573a577bc3a84cf33a04581f20b1cbed44bcd86147348cccdf7ded3b974bfb5b2711c2afb27c67834a22bd7411aa43895c9f480bbbed7373d345c24ac55e36018ad065", "image_id" : 8708, "num" : 0, "tags" : [ @@ -96,7 +96,7 @@ __tests__ = ( "うちのこ", ], "title" : "うちのこえっち", - "url" : "https://pic.nijie.net/07/horne/18/00/58000/illust/0_0_c8f715a8f3d53943_db6231.png", + "url" : "https://pic.nijie.net/__s4__/d7e18cb679f35b388dc8b0b9f2edb178078469b8970ee099cd573a577bc3a84cf33a04581f20b1cbed44bcd86147348cccdf7ded3b974bfb5b2711c2afb27c67834a22bd7411aa43895c9f480bbbed7373d345c24ac55e36018ad065.png", "user_id" : 58000, "user_name" : "のえるわ", }, @@ -106,10 +106,10 @@ __tests__ = ( "#category": ("Nijie", "horne", "image"), "#class" : nijie.NijieImageExtractor, "#urls" : ( - "https://pic.nijie.net/07/horne/18/00/58000/illust/0_0_b4ffb4b6f7ec6d51_1a32c0.png", - "https://pic.nijie.net/07/horne/18/00/58000/illust/8716_0_2690972a4f6270bb_85ed8f.png", - "https://pic.nijie.net/07/horne/18/00/58000/illust/8716_1_09348508d8b76f36_f6cf47.png", - "https://pic.nijie.net/08/horne/18/00/58000/illust/8716_2_5151d956d3789277_d76e75.png", + "https://pic.nijie.net/__s4__/d7b784b573f850628fcae5b4f7ede679085af22dba0caf6bb91622438289ddce9312ab6f2886b8d8ef104f8eb5908d57cc309ec0239464add9f9d8d17d83c39d92c680b083f107d63c68eef29938ebc937699fd50d51b1128404cc6e.png", + "https://pic.nijie.net/__s4__/d7b9dae222f25e388a9debb4ade7eb79b87af28c9650b1babe514902eb854bbd8cb295b379d5480ea83cad78fbc843b146785ba59f1279fa77eb14e33ca66778474afb5063ba36d9d527fa31f780fbf396b27bd9901b0e3565efce08.png", + "https://pic.nijie.net/__s4__/d7b889b276fb5a36dacde5bef7e8ea225e06c9904f18be00035c96721dd1ac6ab7217be29f8c6f58626aa9839835185f08474efd3822a3e298c74b9f2b3d0fc1cd5400b97b74512b0800eabbdcf8d4094be666ea3b6305a436cadd10.png", + "https://pic.nijie.net/__s4__/d7b6d9e173fc59368199ebbef6b9e728aea39dd452c9e7d83d78465e787922b5e3194ba54e58bbf753c33de2b3c9adf063b77b92e56a0b0c28c72e90d9f1d857562b87b2a836c083b5ff85709ebd9e93dd19774fa5a8d624133d4eda.png", ), "artist_id" : 58000, diff --git a/test/results/nijie.py b/test/results/nijie.py index 0ce9a258..ff51cbfa 100644 --- a/test/results/nijie.py +++ b/test/results/nijie.py @@ -25,8 +25,8 @@ __tests__ = ( "#category": ("Nijie", "nijie", "illustration"), "#class" : nijie.NijieIllustrationExtractor, "#urls": ( - "https://pic.nijie.net/04/nijie/14/44/44/illust/0_0_f46c08462568c2f1_be95d7.jpg", - "https://pic.nijie.net/06/nijie/14/44/44/illust/0_0_28e8c02d921bee33_9222d3.jpg", + "https://pic.nijie.net/__s4__/d7b5d8b576a90f3688cfe6bfa6ebb678817ecb4c19f118e187e0f039c81b2e5d0b6c2edfe359d9f65b457507bf9ae807801a0ac27b9cf06ee94e1cb848c75d2f31353acc3197dff04f537d70a7cb6b8782f6f0635de3f3d522e57827.jpg", + "https://pic.nijie.net/__s4__/d7e2d9b124a95933ddc4e5baadbcb62b2a0ce7c6163dadac1d49c57e8da5d113398f3170da7835f03c897d9d6a9993d8fa40036a5209508611a305280cd684b33ca600f8160ee0d958b7c7f49972e4f4c650b8d58fff493a032d25f8.jpg", ), "artist_id" : 44, @@ -40,7 +40,7 @@ __tests__ = ( "num" : 0, "tags" : list, "title" : str, - "url" : r"re:https://pic.nijie.net/\d+/nijie/.*jpg$", + "url" : r"re:https://pic.nijie.net/__s4__/[0-9a-f]{184}.jpg$", "user_id" : 44, "user_name" : "ED", }, @@ -101,9 +101,7 @@ __tests__ = ( "#url" : "https://nijie.info/view.php?id=70720", "#category": ("Nijie", "nijie", "image"), "#class" : nijie.NijieImageExtractor, - "#urls" : "https://pic.nijie.net/06/nijie/14/44/44/illust/0_0_28e8c02d921bee33_9222d3.jpg", - "#sha1_url" : "3d654e890212ba823c9647754767336aebc0a743", - "#sha1_metadata": "58e716bcb03b431cae901178c198c787908e1c0c", + "#urls" : "https://pic.nijie.net/__s4__/d7e2d9b124a95933ddc4e5baadbcb62b2a0ce7c6163dadac1d49c57e8da5d113398f3170da7835f03c897d9d6a9993d8fa40036a5209508611a305280cd684b33ca600f8160ee0d958b7c7f49972e4f4c650b8d58fff493a032d25f8.jpg", "#sha1_content" : "d85e3ea896ed5e4da0bca2390ad310a4df716ca6", "artist_id" : 44, @@ -112,12 +110,12 @@ __tests__ = ( "date" : "dt:2014-01-18 19:58:21", "description": "租絵にてお邪魔いたし候\r\n是非ともこの”おっぱい”をご高覧賜りたく馳せ参じた次第\r\n長文にて失礼仕る\r\n\r\nまず全景でありますが、首を右に傾けてみて頂きたい\r\nこの絵図は茶碗を眺めていた私が思わぬ美しさにて昇天したときのものを、筆をとり、したためたものである（トレースではない）\r\n筆は疾風の如く走り、半刻過ぎには私好みの”おっぱい”になっていたのである！\r\n次に細部をみて頂きたい\r\n絵図を正面から見直して頂くと、なんとはんなりと美しいお椀型をしたおっぱいであろうか　　右手から緩やかに生まれる曲線は左手に進むにつれて、穏やかな歪みを含み流れる　　これは所謂轆轤目であるが三重の紐でおっぱいをぐるぐると巻きつけた情景そのままであり、この歪みから茶碗の均整は崩れ、たぷんたぷんのおっぱいの重量感を醸し出している！\r\nさらに左手に進めば梅花皮（カイラギ）を孕んだ高大が現れる　今回は点線にて表現するが、その姿は乳首から母乳が噴出するが如く　或は精子をぶっかけられたが如く　白くとろっとした釉薬の凝固が素晴しい景色をつくりだしているのである！\r\n最後には極めつけ、すくっと螺旋を帯びながらそそり立つ兜巾（ときん）！この情景はまさしく乳首である！　　全体をふんわりと盛り上げさせる乳輪にちょこっと存在する乳頭はぺろりと舌で確かめ勃起させたくなる風情がある！\r\n\r\nこれを”おっぱい”と呼ばずなんと呼ぼうや！？\r\n\r\n興奮のあまり失礼致した\r\n御免", "extension" : "jpg", - "filename" : "0_0_28e8c02d921bee33_9222d3", + "filename" : "d7e2d9b124a95933ddc4e5baadbcb62b2a0ce7c6163dadac1d49c57e8da5d113398f3170da7835f03c897d9d6a9993d8fa40036a5209508611a305280cd684b33ca600f8160ee0d958b7c7f49972e4f4c650b8d58fff493a032d25f8", "image_id" : 70720, "num" : 0, "tags" : ["おっぱい"], "title" : "俺好高麗井戸茶碗　銘おっぱい", - "url" : "https://pic.nijie.net/06/nijie/14/44/44/illust/0_0_28e8c02d921bee33_9222d3.jpg", + "url" : "https://pic.nijie.net/__s4__/d7e2d9b124a95933ddc4e5baadbcb62b2a0ce7c6163dadac1d49c57e8da5d113398f3170da7835f03c897d9d6a9993d8fa40036a5209508611a305280cd684b33ca600f8160ee0d958b7c7f49972e4f4c650b8d58fff493a032d25f8.jpg", "user_id" : 44, "user_name" : "ED", }, @@ -135,7 +133,7 @@ __tests__ = ( "#comment" : "'view_side_dojin' thumbnails (#5049)", "#category": ("Nijie", "nijie", "image"), "#class" : nijie.NijieImageExtractor, - "#urls" : "https://pic.nijie.net/03/nijie/13/98/498/illust/0_0_703023d18ca8d058_bca943.jpg", + "#urls" : "https://pic.nijie.net/__s4__/d7b5d9b470fa0d368bcbb0bda4bae2797380288fb3a6f2d9aa1899530bbc0453912f2397ee9a37dbbd992b5bbde36f86061910e06961837c0ae7629006732ef8581a512a0e0b454ca050fa793340367fbef201687f1b8cdb2692898b.jpg", }, { @@ -144,9 +142,9 @@ __tests__ = ( "#category": ("Nijie", "nijie", "image"), "#class" : nijie.NijieImageExtractor, "#urls" : ( - "https://pic.nijie.net/01/nijie/20/82/59182/illust/0_0_162270ef49e2ee28_fab5ae.mp4", - "https://pic.nijie.net/04/nijie/20/82/59182/illust/385585_0_ff2d5d19129530d5_b2821e.jpg", - "https://pic.nijie.net/01/nijie/20/82/59182/illust/385585_1_7ee1a2a67bed2f84_212d67.jpg", + "https://pic.nijie.net/__s4__/d7b884ee71f90f358fcfe0bbf2e7b57ac1b72bd5df705d984997b3d47968e387b4d2e33c04faa793c9bb26f3f005eb5f875b440fcabb36f02d811203325ce520aacc1581c0ea361906bd6877031942a2a340d44ff9ba3d9c23950d44.mp4", + "https://pic.nijie.net/__s4__/d7e685e777ae0f308ecaeabda0e8e32c4a0873467846be7078716328f9b105bfc278d968db43d2707e577c63c231fb1a4999570823c460f18ee35b790f6e1c4a4c01a05a8c3260c2cd3b9f77810e5a1b2a22755f279f47cf86e75733.jpg", + "https://pic.nijie.net/__s4__/d7b38cee78f80c678acae3bef2b9e32c0fd196fdafaed57c041390ac33dd8f23b3236a48d9d41c6081ce7ca79840caa7deacc0120a0dc516210e2925c954d79c08e94bb9c0f7c572bd174336f64e6924721a2727078df5ad48e77b1b.jpg", ), },