Skip to content

Commit

Permalink
[pixnet] detect password-protected albums (#177)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikf committed Aug 8, 2020
1 parent 67ac666 commit a6a0806
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions gallery_dl/extractor/pixnet.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- 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
# it under the terms of the GNU General Public License version 2 as
Expand All @@ -9,7 +9,7 @@
"""Extractors for https://www.pixnet.net/"""

from .common import Extractor, Message
from .. import text
from .. import text, exception


BASE_PATTERN = r"(?:https?://)?(?!www\.)([^.]+)\.pixnet.net"
Expand Down Expand Up @@ -53,6 +53,9 @@ def _pagination(self, page):
yield from text.extract_iter(page, '<li id="', '</li>')

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:
return
url = self.root + text.extract(pnext, 'href="', '"')[0]
Expand Down Expand Up @@ -107,6 +110,9 @@ class PixnetSetExtractor(PixnetExtractor):
"url": "b3eb6431aea0bcf5003432a4a0f3a3232084fc13",
"keyword": "bf7004faa1cea18cf9bd856f0955a69be51b1ec6",
}),
("https://sky92100.pixnet.net/album/set/17492544", {
"count": 0, # password-protected
}),
)

def items(self):
Expand Down

0 comments on commit a6a0806

Please sign in to comment.