diff --git a/gallery_dl/extractor/adultempire.py b/gallery_dl/extractor/adultempire.py
index bb87189a..3249ae6f 100644
--- a/gallery_dl/extractor/adultempire.py
+++ b/gallery_dl/extractor/adultempire.py
@@ -48,4 +48,4 @@ class AdultempireGalleryExtractor(GalleryExtractor):
if len(urls) < 24:
return
params["page"] += 1
- page = self.request(self.gallery_url, params=params).text
+ page = self.request(self.page_url, params=params).text
diff --git a/gallery_dl/extractor/batoto.py b/gallery_dl/extractor/batoto.py
index 331e9906..84e7288d 100644
--- a/gallery_dl/extractor/batoto.py
+++ b/gallery_dl/extractor/batoto.py
@@ -86,7 +86,7 @@ class BatotoChapterExtractor(BatotoBase, ChapterExtractor):
ChapterExtractor.__init__(self, match, False)
self._init_root()
self.chapter_id = self.groups[1]
- self.gallery_url = "{}/title/0/{}".format(self.root, self.chapter_id)
+ self.page_url = "{}/title/0/{}".format(self.root, self.chapter_id)
def metadata(self, page):
extr = text.extract_from(page)
@@ -147,7 +147,7 @@ class BatotoMangaExtractor(BatotoBase, MangaExtractor):
MangaExtractor.__init__(self, match, False)
self._init_root()
self.manga_id = self.groups[1] or self.groups[2]
- self.manga_url = "{}/title/{}".format(self.root, self.manga_id)
+ self.page_url = "{}/title/{}".format(self.root, self.manga_id)
def chapters(self, page):
extr = text.extract_from(page)
diff --git a/gallery_dl/extractor/bbc.py b/gallery_dl/extractor/bbc.py
index 5c93fa15..61d63170 100644
--- a/gallery_dl/extractor/bbc.py
+++ b/gallery_dl/extractor/bbc.py
@@ -33,7 +33,7 @@ class BbcGalleryExtractor(GalleryExtractor):
page, "
", "
").rpartition("")[2]),
"description": text.unescape(text.extr(
page, 'property="og:description" content="', '"')),
- "programme": self.gallery_url.split("/")[4],
+ "programme": self.page_url.split("/")[4],
"path": list(util.unique_sequence(
element["name"]
for element in data["itemListElement"]
diff --git a/gallery_dl/extractor/catbox.py b/gallery_dl/extractor/catbox.py
index 6c81f539..22f7a976 100644
--- a/gallery_dl/extractor/catbox.py
+++ b/gallery_dl/extractor/catbox.py
@@ -26,7 +26,7 @@ class CatboxAlbumExtractor(GalleryExtractor):
def metadata(self, page):
extr = text.extract_from(page)
return {
- "album_id" : self.gallery_url.rpartition("/")[2],
+ "album_id" : self.page_url.rpartition("/")[2],
"album_name" : text.unescape(extr("", "<")),
"date" : text.parse_datetime(extr(
"
Created ", "<"), "%B %d %Y"),
diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py
index 1046591e..8b7bd67c 100644
--- a/gallery_dl/extractor/common.py
+++ b/gallery_dl/extractor/common.py
@@ -730,14 +730,14 @@ class GalleryExtractor(Extractor):
def __init__(self, match, url=None):
Extractor.__init__(self, match)
- self.gallery_url = self.root + self.groups[0] if url is None else url
+ self.page_url = self.root + self.groups[0] if url is None else url
def items(self):
self.login()
- if self.gallery_url:
+ if self.page_url:
page = self.request(
- self.gallery_url, notfound=self.subcategory).text
+ self.page_url, notfound=self.subcategory).text
else:
page = None
@@ -823,7 +823,7 @@ class MangaExtractor(Extractor):
def __init__(self, match, url=None):
Extractor.__init__(self, match)
- self.manga_url = self.root + self.groups[0] if url is None else url
+ self.page_url = self.root + self.groups[0] if url is None else url
if self.config("chapter-reverse", False):
self.reverse = not self.reverse
@@ -831,8 +831,8 @@ class MangaExtractor(Extractor):
def items(self):
self.login()
- if self.manga_url:
- page = self.request(self.manga_url, notfound=self.subcategory).text
+ if self.page_url:
+ page = self.request(self.page_url, notfound=self.subcategory).text
else:
page = None
diff --git a/gallery_dl/extractor/foolslide.py b/gallery_dl/extractor/foolslide.py
index 6f643b78..7c59f720 100644
--- a/gallery_dl/extractor/foolslide.py
+++ b/gallery_dl/extractor/foolslide.py
@@ -18,7 +18,7 @@ class FoolslideExtractor(BaseExtractor):
def __init__(self, match):
BaseExtractor.__init__(self, match)
- self.gallery_url = self.root + self.groups[-1]
+ self.page_url = self.root + self.groups[-1]
def request(self, url):
return BaseExtractor.request(
@@ -51,7 +51,7 @@ class FoolslideChapterExtractor(FoolslideExtractor):
example = "https://read.powermanga.org/read/MANGA/en/0/123/"
def items(self):
- page = self.request(self.gallery_url).text
+ page = self.request(self.page_url).text
data = self.metadata(page)
imgs = self.images(page)
@@ -78,7 +78,7 @@ class FoolslideChapterExtractor(FoolslideExtractor):
def metadata(self, page):
extr = text.extract_from(page)
extr('
', '')
- return self.parse_chapter_url(self.gallery_url, {
+ return self.parse_chapter_url(self.page_url, {
"manga" : text.unescape(extr('title="', '"')).strip(),
"chapter_string": text.unescape(extr('title="', '"')),
})
@@ -95,7 +95,7 @@ class FoolslideMangaExtractor(FoolslideExtractor):
example = "https://read.powermanga.org/series/MANGA/"
def items(self):
- page = self.request(self.gallery_url).text
+ page = self.request(self.page_url).text
chapters = self.chapters(page)
if not self.config("chapter-reverse", False):
diff --git a/gallery_dl/extractor/fuskator.py b/gallery_dl/extractor/fuskator.py
index fa5ec171..943f43f2 100644
--- a/gallery_dl/extractor/fuskator.py
+++ b/gallery_dl/extractor/fuskator.py
@@ -27,7 +27,7 @@ class FuskatorGalleryExtractor(GalleryExtractor):
def metadata(self, page):
headers = {
- "Referer" : self.gallery_url,
+ "Referer" : self.page_url,
"X-Requested-With": "XMLHttpRequest",
}
auth = self.request(
diff --git a/gallery_dl/extractor/hentaicosplays.py b/gallery_dl/extractor/hentaicosplays.py
index 4992b7b8..14db971b 100644
--- a/gallery_dl/extractor/hentaicosplays.py
+++ b/gallery_dl/extractor/hentaicosplays.py
@@ -44,10 +44,10 @@ class HentaicosplaysGalleryExtractor(
def __init__(self, match):
BaseExtractor.__init__(self, match)
self.slug = self.groups[-1]
- self.gallery_url = "{}/story/{}/".format(self.root, self.slug)
+ self.page_url = "{}/story/{}/".format(self.root, self.slug)
def _init(self):
- self.session.headers["Referer"] = self.gallery_url
+ self.session.headers["Referer"] = self.page_url
def metadata(self, page):
title = text.extr(page, "", "")
diff --git a/gallery_dl/extractor/hentaihand.py b/gallery_dl/extractor/hentaihand.py
index d44c8afe..6ac818fa 100644
--- a/gallery_dl/extractor/hentaihand.py
+++ b/gallery_dl/extractor/hentaihand.py
@@ -44,7 +44,7 @@ class HentaihandGalleryExtractor(GalleryExtractor):
return data
def images(self, _):
- info = self.request(self.gallery_url + "/images").json()
+ info = self.request(self.page_url + "/images").json()
return [(img["source_url"], img) for img in info["images"]]
diff --git a/gallery_dl/extractor/hentaihere.py b/gallery_dl/extractor/hentaihere.py
index 1cdbca15..9224246e 100644
--- a/gallery_dl/extractor/hentaihere.py
+++ b/gallery_dl/extractor/hentaihere.py
@@ -72,7 +72,7 @@ class HentaihereMangaExtractor(HentaihereBase, MangaExtractor):
mtype, pos = text.extract(
page, '[', ']', pos)
manga_id = text.parse_int(
- self.manga_url.rstrip("/").rpartition("/")[2][1:])
+ self.page_url.rstrip("/").rpartition("/")[2][1:])
while True:
marker, pos = text.extract(
diff --git a/gallery_dl/extractor/hiperdex.py b/gallery_dl/extractor/hiperdex.py
index dc8f57d0..3a8a0c7d 100644
--- a/gallery_dl/extractor/hiperdex.py
+++ b/gallery_dl/extractor/hiperdex.py
@@ -99,14 +99,14 @@ class HiperdexMangaExtractor(HiperdexBase, MangaExtractor):
def chapters(self, page):
data = self.manga_data(self.manga, page)
- self.manga_url = url = data["url"]
+ self.page_url = url = data["url"]
- url = self.manga_url + "ajax/chapters/"
+ url = self.page_url + "ajax/chapters/"
headers = {
"Accept": "*/*",
"X-Requested-With": "XMLHttpRequest",
"Origin": self.root,
- "Referer": "https://" + text.quote(self.manga_url[8:]),
+ "Referer": "https://" + text.quote(self.page_url[8:]),
}
html = self.request(url, method="POST", headers=headers).text
diff --git a/gallery_dl/extractor/hitomi.py b/gallery_dl/extractor/hitomi.py
index e4e12bca..6f5ee133 100644
--- a/gallery_dl/extractor/hitomi.py
+++ b/gallery_dl/extractor/hitomi.py
@@ -32,7 +32,7 @@ class HitomiGalleryExtractor(HitomiExtractor, GalleryExtractor):
def __init__(self, match):
GalleryExtractor.__init__(self, match, False)
self.gid = gid = self.groups[0]
- self.gallery_url = "https://ltn.{}/galleries/{}.js".format(
+ self.page_url = "https://ltn.{}/galleries/{}.js".format(
self.domain, gid)
def _init(self):
diff --git a/gallery_dl/extractor/imagechest.py b/gallery_dl/extractor/imagechest.py
index 30147ca4..4ebad882 100644
--- a/gallery_dl/extractor/imagechest.py
+++ b/gallery_dl/extractor/imagechest.py
@@ -31,7 +31,7 @@ class ImagechestGalleryExtractor(GalleryExtractor):
access_token = self.config("access-token")
if access_token:
self.api = ImagechestAPI(self, access_token)
- self.gallery_url = None
+ self.page_url = None
self.metadata = self._metadata_api
def metadata(self, page):
diff --git a/gallery_dl/extractor/imhentai.py b/gallery_dl/extractor/imhentai.py
index fd46dba9..52e54108 100644
--- a/gallery_dl/extractor/imhentai.py
+++ b/gallery_dl/extractor/imhentai.py
@@ -85,7 +85,7 @@ class ImhentaiGalleryExtractor(ImhentaiExtractor, GalleryExtractor):
def __init__(self, match):
ImhentaiExtractor.__init__(self, match)
self.gallery_id = self.groups[-1]
- self.gallery_url = "{}/gallery/{}/".format(self.root, self.gallery_id)
+ self.page_url = "{}/gallery/{}/".format(self.root, self.gallery_id)
def metadata(self, page):
extr = text.extract_from(page)
diff --git a/gallery_dl/extractor/manganelo.py b/gallery_dl/extractor/manganelo.py
index 5e92aee1..a6948e3b 100644
--- a/gallery_dl/extractor/manganelo.py
+++ b/gallery_dl/extractor/manganelo.py
@@ -44,7 +44,7 @@ class ManganeloChapterExtractor(ManganeloExtractor, ChapterExtractor):
def __init__(self, match):
ManganeloExtractor.__init__(self, match)
- self.gallery_url = self.root + self.groups[-1]
+ self.page_url = self.root + self.groups[-1]
def metadata(self, page):
extr = text.extract_from(page)
@@ -91,7 +91,7 @@ class ManganeloMangaExtractor(ManganeloExtractor, MangaExtractor):
def __init__(self, match):
ManganeloExtractor.__init__(self, match)
- self.manga_url = self.root + self.groups[-1]
+ self.page_url = self.root + self.groups[-1]
def chapters(self, page):
extr = text.extract_from(page)
diff --git a/gallery_dl/extractor/myhentaigallery.py b/gallery_dl/extractor/myhentaigallery.py
index d8c88be5..6c23f497 100644
--- a/gallery_dl/extractor/myhentaigallery.py
+++ b/gallery_dl/extractor/myhentaigallery.py
@@ -25,7 +25,7 @@ class MyhentaigalleryGalleryExtractor(GalleryExtractor):
GalleryExtractor.__init__(self, match, url)
def _init(self):
- self.session.headers["Referer"] = self.gallery_url
+ self.session.headers["Referer"] = self.page_url
def metadata(self, page):
extr = text.extract_from(page)
diff --git a/gallery_dl/extractor/nudostar.py b/gallery_dl/extractor/nudostar.py
index adaa422a..467d36af 100644
--- a/gallery_dl/extractor/nudostar.py
+++ b/gallery_dl/extractor/nudostar.py
@@ -57,7 +57,7 @@ class NudostarImageExtractor(NudostarExtractor):
example = "https://nudostar.tv/models/MODEL/123/"
def items(self):
- page = self.request(self.gallery_url, notfound=self.subcategory).text
+ page = self.request(self.page_url, notfound=self.subcategory).text
img_url = text.extract(
page, 'src="', '"', page.index('class="headline"'))[0]
diff --git a/gallery_dl/extractor/readcomiconline.py b/gallery_dl/extractor/readcomiconline.py
index b7c152af..71d62059 100644
--- a/gallery_dl/extractor/readcomiconline.py
+++ b/gallery_dl/extractor/readcomiconline.py
@@ -62,7 +62,7 @@ class ReadcomiconlineIssueExtractor(ReadcomiconlineBase, ChapterExtractor):
else:
params["quality"] = str(quality)
- self.gallery_url += "&".join(k + "=" + v for k, v in params.items())
+ self.page_url += "&".join(k + "=" + v for k, v in params.items())
self.issue_id = params.get("id")
def metadata(self, page):
@@ -79,7 +79,7 @@ class ReadcomiconlineIssueExtractor(ReadcomiconlineBase, ChapterExtractor):
def images(self, page):
results = []
- referer = {"_http_headers": {"Referer": self.gallery_url}}
+ referer = {"_http_headers": {"Referer": self.page_url}}
root = text.extr(page, "return baeu(l, '", "'")
replacements = re.findall(
diff --git a/gallery_dl/extractor/redbust.py b/gallery_dl/extractor/redbust.py
index 3a3af13e..d00ed526 100644
--- a/gallery_dl/extractor/redbust.py
+++ b/gallery_dl/extractor/redbust.py
@@ -57,7 +57,7 @@ class RedbustGalleryExtractor(GalleryExtractor, RedbustExtractor):
page, "