diff options
Diffstat (limited to 'gallery_dl/extractor/bellazon.py')
| -rw-r--r-- | gallery_dl/extractor/bellazon.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gallery_dl/extractor/bellazon.py b/gallery_dl/extractor/bellazon.py index 33f4ad3..b9ec3d9 100644 --- a/gallery_dl/extractor/bellazon.py +++ b/gallery_dl/extractor/bellazon.py @@ -24,7 +24,7 @@ class BellazonExtractor(Extractor): archive_fmt = "{post[id]}/{id}_{filename}" def items(self): - native = (f"{self.root}/", f"{self.root[6:]}/") + native = (self.root + "/", self.root[6:] + "/") extract_urls = text.re( r'(?s)<(' r'(?:video .*?<source [^>]*?src|a [^>]*?href)="([^"]+).*?</a>' @@ -82,7 +82,7 @@ class BellazonExtractor(Extractor): dc["extension"] = text.ext_from_url(url) if url[0] == "/": - url = f"https:{url}" + url = "https:" + url yield Message.Url, url, dc else: @@ -91,10 +91,10 @@ class BellazonExtractor(Extractor): yield Message.Queue, url, data def _pagination(self, base, pnum=None): - base = f"{self.root}{base}" + base = self.root + base if pnum is None: - url = f"{base}/" + url = base + "/" pnum = 1 else: url = f"{base}/page/{pnum}/" @@ -112,7 +112,7 @@ class BellazonExtractor(Extractor): url = f"{base}/page/{pnum}/" def _pagination_reverse(self, base, pnum=None): - base = f"{self.root}{base}" + base = self.root + base url = f"{base}/page/{'9999' if pnum is None else pnum}/" with self.request(url) as response: @@ -127,7 +127,7 @@ class BellazonExtractor(Extractor): if pnum > 1: url = f"{base}/page/{pnum}/" elif pnum == 1: - url = f"{base}/" + url = base + "/" else: return @@ -192,15 +192,15 @@ class BellazonExtractor(Extractor): class BellazonPostExtractor(BellazonExtractor): subcategory = "post" - pattern = (rf"{BASE_PATTERN}(/topic/\d+-[\w-]+(?:/page/\d+)?)" - rf"/?#(?:findC|c)omment-(\d+)") + pattern = (BASE_PATTERN + r"(/topic/\d+-[\w-]+(?:/page/\d+)?)" + r"/?#(?:findC|c)omment-(\d+)") example = "https://www.bellazon.com/main/topic/123-SLUG/#findComment-12345" def posts(self): path, post_id = self.groups - page = self.request(f"{self.root}{path}").text + page = self.request(self.root + path).text - pos = page.find(f'id="elComment_{post_id}') + pos = page.find('id="elComment_' + post_id) if pos < 0: raise exception.NotFoundError("post") html = text.extract(page, "<article ", "</article>", pos-100)[0] @@ -211,7 +211,7 @@ class BellazonPostExtractor(BellazonExtractor): class BellazonThreadExtractor(BellazonExtractor): subcategory = "thread" - pattern = rf"{BASE_PATTERN}(/topic/\d+-[\w-]+)(?:/page/(\d+))?" + pattern = BASE_PATTERN + r"(/topic/\d+-[\w-]+)(?:/page/(\d+))?" example = "https://www.bellazon.com/main/topic/123-SLUG/" def posts(self): @@ -236,7 +236,7 @@ class BellazonThreadExtractor(BellazonExtractor): class BellazonForumExtractor(BellazonExtractor): subcategory = "forum" - pattern = rf"{BASE_PATTERN}(/forum/\d+-[\w-]+)(?:/page/(\d+))?" + pattern = BASE_PATTERN + r"(/forum/\d+-[\w-]+)(?:/page/(\d+))?" example = "https://www.bellazon.com/main/forum/123-SLUG/" def items(self): |