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

[pixnet] detect password-protected albums (#177)

Browse Source
This commit is contained in:
Mike Fährmann
2020-08-08 19:36:46 +02:00
parent 67ac6667af
commit a6a080656c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gallery_dl/extractor/pixnet.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2016-2019 Mike Fährmann # Copyright 2016-2020 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
@@ -9,7 +9,7 @@
"""Extractors for https://www.pixnet.net/""" """Extractors for https://www.pixnet.net/"""
from .common import Extractor, Message from .common import Extractor, Message
from .. import text from .. import text, exception
BASE_PATTERN = r"(?:https?://)?(?!www\.)([^.]+)\.pixnet.net" BASE_PATTERN = r"(?:https?://)?(?!www\.)([^.]+)\.pixnet.net"
@@ -53,6 +53,9 @@ class PixnetExtractor(Extractor):
yield from text.extract_iter(page, '<li id="', '</li>') yield from text.extract_iter(page, '<li id="', '</li>')
pnext = text.extract(page, 'class="nextBtn"', '>')[0] pnext = text.extract(page, 'class="nextBtn"', '>')[0]
if pnext is None and 'name="albumpass">' in page:
raise exception.StopExtraction(
"Album %s is password-protected.", self.item_id)
if "href" not in pnext: if "href" not in pnext:
return return
url = self.root + text.extract(pnext, 'href="', '"')[0] url = self.root + text.extract(pnext, 'href="', '"')[0]
@@ -107,6 +110,9 @@ class PixnetSetExtractor(PixnetExtractor):
"url": "b3eb6431aea0bcf5003432a4a0f3a3232084fc13", "url": "b3eb6431aea0bcf5003432a4a0f3a3232084fc13",
"keyword": "bf7004faa1cea18cf9bd856f0955a69be51b1ec6", "keyword": "bf7004faa1cea18cf9bd856f0955a69be51b1ec6",
}), }),
("https://sky92100.pixnet.net/album/set/17492544", {
"count": 0, # password-protected
}),
) )
def items(self): def items(self):