github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[common] rename 'gallery_url'/'manga_url' to 'page_url

Browse Source
This commit is contained in:
Mike Fährmann
2025-06-26 22:06:57 +02:00
parent 8a93616a2d
commit 26e81e4162
26 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gallery_dl/extractor/adultempire.py
View File

@@ -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

4
gallery_dl/extractor/batoto.py
View File

@@ -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)

2
gallery_dl/extractor/bbc.py
View File

@@ -33,7 +33,7 @@ class BbcGalleryExtractor(GalleryExtractor):
page, "<h1>", "</h1>").rpartition("</span>")[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"]

2
gallery_dl/extractor/catbox.py
View File

@@ -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("<h1>", "<")),
"date" : text.parse_datetime(extr(
"<p>Created ", "<"), "%B %d %Y"),

12
gallery_dl/extractor/common.py
View File

@@ -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

8
gallery_dl/extractor/foolslide.py
View File

@@ -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('<h1 class="tbtitle dnone">', '')
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):

2
gallery_dl/extractor/fuskator.py
View File

@@ -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(

4
gallery_dl/extractor/hentaicosplays.py
View File

@@ -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, "<title>", "</title>")

2
gallery_dl/extractor/hentaihand.py
View File

@@ -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"]]

2
gallery_dl/extractor/hentaihere.py
View File

@@ -72,7 +72,7 @@ class HentaihereMangaExtractor(HentaihereBase, MangaExtractor):
mtype, pos = text.extract(
page, '<span class="mngType text-danger">[', ']</span>', 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(

6
gallery_dl/extractor/hiperdex.py
View File

@@ -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

2
gallery_dl/extractor/hitomi.py
View File

@@ -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):

2
gallery_dl/extractor/imagechest.py
View File

@@ -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):

2
gallery_dl/extractor/imhentai.py
View File

@@ -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)

4
gallery_dl/extractor/manganelo.py
View File

@@ -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)

2
gallery_dl/extractor/myhentaigallery.py
View File

@@ -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)

2
gallery_dl/extractor/nudostar.py
View File

@@ -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]

4
gallery_dl/extractor/readcomiconline.py
View File

@@ -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(

2
gallery_dl/extractor/redbust.py
View File

@@ -57,7 +57,7 @@ class RedbustGalleryExtractor(GalleryExtractor, RedbustExtractor):
page, "<link rel='shortlink' href='https://redbust.com/?p=", "'")
if gid:
self.gallery_url = False
self.page_url = False
return GalleryExtractor.items(self)
else:
self.subcategory = "category"

2
gallery_dl/extractor/schalenetwork.py
View File

@@ -89,7 +89,7 @@ class SchalenetworkGalleryExtractor(SchalenetworkExtractor, GalleryExtractor):
def __init__(self, match):
GalleryExtractor.__init__(self, match)
self.gallery_url = None
self.page_url = None
def _init(self):
self.headers = {

2
gallery_dl/extractor/senmanga.py
View File

@@ -20,7 +20,7 @@ class SenmangaChapterExtractor(ChapterExtractor):
example = "https://raw.senmanga.com/MANGA/CHAPTER"
def _init(self):
self.session.headers["Referer"] = self.gallery_url
self.session.headers["Referer"] = self.page_url
# select "All pages" viewer
self.cookies.set("viewer", "1", domain="raw.senmanga.com")

4
gallery_dl/extractor/simplyhentai.py
View File

@@ -29,7 +29,7 @@ class SimplyhentaiGalleryExtractor(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)
@@ -55,7 +55,7 @@ class SimplyhentaiGalleryExtractor(GalleryExtractor):
return data
def images(self, _):
url = self.gallery_url + "/all-pages"
url = self.page_url + "/all-pages"
headers = {"Accept": "application/json"}
images = self.request(url, headers=headers).json()
return [

2
gallery_dl/extractor/tsumino.py
View File

@@ -82,7 +82,7 @@ class TsuminoGalleryExtractor(TsuminoBase, GalleryExtractor):
def images(self, page):
url = "{}/Read/Index/{}?page=1".format(self.root, self.gallery_id)
headers = {"Referer": self.gallery_url}
headers = {"Referer": self.page_url}
response = self.request(url, headers=headers, fatal=False)
if "/Auth/" in response.url:

2
gallery_dl/extractor/webtoons.py
View File

@@ -60,7 +60,7 @@ class WebtoonsEpisodeExtractor(WebtoonsBase, GalleryExtractor):
params = text.parse_query(query)
self.title_no = params.get("title_no")
self.episode_no = params.get("episode_no")
self.gallery_url = f"{self.root}/{base}/viewer?{query}"
self.page_url = f"{self.root}/{base}/viewer?{query}"
def metadata(self, page):
extr = text.extract_from(page)

2
gallery_dl/extractor/weebcentral.py
View File

@@ -64,7 +64,7 @@ class WeebcentralChapterExtractor(WeebcentralBase, ChapterExtractor):
return data
def images(self, page):
referer = self.gallery_url
referer = self.page_url
url = referer + "/images"
params = {
"is_prev" : "False",

2
gallery_dl/extractor/zzup.py
View File

@@ -57,6 +57,6 @@ class ZzupGalleryExtractor(GalleryExtractor):
if pos < 0:
break
path = text.rextr(page, ' href="', '"', pos)
page = self.request(text.urljoin(self.gallery_url, path)).text
page = self.request(text.urljoin(self.page_url, path)).text
return results