diff options
Diffstat (limited to 'gallery_dl/extractor/pixnet.py')
| -rw-r--r-- | gallery_dl/extractor/pixnet.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gallery_dl/extractor/pixnet.py b/gallery_dl/extractor/pixnet.py index eb3edc3..75c06bb 100644 --- a/gallery_dl/extractor/pixnet.py +++ b/gallery_dl/extractor/pixnet.py @@ -19,12 +19,11 @@ class PixnetExtractor(Extractor): category = "pixnet" filename_fmt = "{num:>03}_{id}.{extension}" archive_fmt = "{id}" - url_fmt = "" def __init__(self, match): Extractor.__init__(self, match) - self.blog, self.item_id = match.groups() - self.root = "https://{}.pixnet.net".format(self.blog) + self.blog, self.item_id = self.groups + self.root = f"https://{self.blog}.pixnet.net" def items(self): url = self.url_fmt.format(self.root, self.item_id) @@ -53,8 +52,8 @@ class PixnetExtractor(Extractor): pnext = text.extr(page, 'class="nextBtn"', '>') if pnext is None and 'name="albumpass">' in page: - raise exception.StopExtraction( - "Album %s is password-protected.", self.item_id) + raise exception.AbortExtraction( + f"Album {self.item_id} is password-protected.") if "href" not in pnext: return url = self.root + text.extr(pnext, 'href="', '"') @@ -72,12 +71,12 @@ class PixnetImageExtractor(PixnetExtractor): def items(self): url = "https://api.pixnet.cc/oembed" params = { - "url": "https://{}.pixnet.net/album/photo/{}".format( - self.blog, self.item_id), + "url": (f"https://{self.blog}.pixnet.net" + f"/album/photo/{self.item_id}"), "format": "json", } - data = self.request(url, params=params).json() + data = self.request_json(url, params=params) data["id"] = text.parse_int( data["url"].rpartition("/")[2].partition("-")[0]) data["filename"], _, data["extension"] = data["title"].rpartition(".") @@ -91,14 +90,13 @@ class PixnetImageExtractor(PixnetExtractor): class PixnetSetExtractor(PixnetExtractor): """Extractor for images from a pixnet set""" subcategory = "set" - url_fmt = "{}/album/set/{}" directory_fmt = ("{category}", "{blog}", "{folder_id} {folder_title}", "{set_id} {set_title}") pattern = BASE_PATTERN + r"/album/set/(\d+)" example = "https://USER.pixnet.net/album/set/12345" def items(self): - url = self.url_fmt.format(self.root, self.item_id) + url = f"{self.root}/album/set/{self.item_id}" page = self.request(url, encoding="utf-8").text data = self.metadata(page) |