github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[nijie] support downloading videos (#5707, #5617)

Browse Source
This commit is contained in:
Mike Fährmann
2024-06-08 22:55:28 +02:00
parent e17b1d5073
commit 2e11b6e756
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/extractor/nijie.py
View File

@@ -56,7 +56,7 @@ class NijieExtractor(AsynchronousMixin, BaseExtractor):
data["user_id"] = data["artist_id"] data["user_id"] = data["artist_id"]
data["user_name"] = data["artist_name"] data["user_name"] = data["artist_name"]
urls = list(self._extract_images(image_id, page)) urls = self._extract_images(image_id, page)
data["count"] = len(urls) data["count"] = len(urls)
yield Message.Directory, data yield Message.Directory, data
@@ -113,11 +113,14 @@ class NijieExtractor(AsynchronousMixin, BaseExtractor):
# multiple images # multiple images
url = "{}/view_popup.php?id={}".format(self.root, image_id) url = "{}/view_popup.php?id={}".format(self.root, image_id)
page = self.request(url).text page = self.request(url).text
yield from text.extract_iter( return [
page, 'href="javascript:void(0);"><img src="', '"') text.extr(media, ' src="', '"')
for media in text.extract_iter(
page, 'href="javascript:void(0);"><', '>')
]
else: else:
pos = page.find('id="view-center"') + 1 pos = page.find('id="view-center"') + 1
yield text.extract(page, 'itemprop="image" src="', '"', pos)[0] return (text.extr(page, 'itemprop="image" src="', '"', pos),)
@staticmethod @staticmethod
def _extract_user_name(page): def _extract_user_name(page):

12
test/results/nijie.py
View File

@@ -165,6 +165,18 @@ __tests__ = (
"#urls" : "https://pic.nijie.net/03/nijie/13/98/498/illust/0_0_703023d18ca8d058_bca943.jpg", "#urls" : "https://pic.nijie.net/03/nijie/13/98/498/illust/0_0_703023d18ca8d058_bca943.jpg",
}, },
{
"#url" : "https://nijie.info/view.php?id=385585",
"#comment" : "video (#5707)",
"#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",
),
},
{ {
"#url" : "https://nijie.info/view.php?id=70724", "#url" : "https://nijie.info/view.php?id=70724",
"#category": ("Nijie", "nijie", "image"), "#category": ("Nijie", "nijie", "image"),