diff options
Diffstat (limited to 'gallery_dl/extractor/xfolio.py')
| -rw-r--r-- | gallery_dl/extractor/xfolio.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gallery_dl/extractor/xfolio.py b/gallery_dl/extractor/xfolio.py index a1a5be3..12f437a 100644 --- a/gallery_dl/extractor/xfolio.py +++ b/gallery_dl/extractor/xfolio.py @@ -38,7 +38,7 @@ class XfolioExtractor(Extractor): response = Extractor.request(self, url, **kwargs) if "/system/recaptcha" in response.url: - raise exception.StopExtraction("Bot check / CAPTCHA page") + raise exception.AbortExtraction("Bot check / CAPTCHA page") return response @@ -47,13 +47,10 @@ class XfolioWorkExtractor(XfolioExtractor): subcategory = "work" pattern = BASE_PATTERN + r"/portfolio/([^/?#]+)/works/(\d+)" example = "https://xfolio.jp/portfolio/USER/works/12345" - ref_fmt = ("{}/fullscale_image?image_id={}&work_id={}") - url_fmt = ("{}/user_asset.php?id={}&work_id={}" - "&work_image_id={}&type=work_image") def items(self): creator, work_id = self.groups - url = "{}/portfolio/{}/works/{}".format(self.root, creator, work_id) + url = f"{self.root}/portfolio/{creator}/works/{work_id}" html = self.request(url).text work = self._extract_data(html) @@ -98,10 +95,11 @@ class XfolioWorkExtractor(XfolioExtractor): files.append({ "image_id" : image_id, "extension": "jpg", - "url": self.url_fmt.format( - self.root, image_id, work_id, image_id), - "_http_headers": {"Referer": self.ref_fmt.format( - self.root, image_id, work_id)}, + "url": (f"{self.root}/user_asset.php?id={image_id}&work_id=" + f"{work_id}&work_image_id={image_id}&type=work_image"), + "_http_headers": {"Referer": ( + f"{self.root}/fullscale_image" + f"?image_id={image_id}&work_id={work_id}")}, }) return files @@ -113,7 +111,7 @@ class XfolioUserExtractor(XfolioExtractor): example = "https://xfolio.jp/portfolio/USER" def works(self): - url = "{}/portfolio/{}/works".format(self.root, self.groups[0]) + url = f"{self.root}/portfolio/{self.groups[0]}/works" while True: html = self.request(url).text @@ -136,7 +134,7 @@ class XfolioSeriesExtractor(XfolioExtractor): def works(self): creator, series_id = self.groups - url = "{}/portfolio/{}/series/{}".format(self.root, creator, series_id) + url = f"{self.root}/portfolio/{creator}/series/{series_id}" html = self.request(url).text return [ |