mirror of
https://github.com/mikf/gallery-dl.git
synced 2024-11-22 10:42:34 +01:00
[exhentai] add 'metadata' option (#1325)
to select between gallery metadata from 'api' or 'html'
This commit is contained in:
parent
8f095a0980
commit
e5735361ed
@ -906,6 +906,19 @@ Description
|
|||||||
instead of the value listed on ``https://e-hentai.org/home.php``
|
instead of the value listed on ``https://e-hentai.org/home.php``
|
||||||
|
|
||||||
|
|
||||||
|
extractor.exhentai.metadata
|
||||||
|
---------------------------
|
||||||
|
Type
|
||||||
|
``string``
|
||||||
|
Default
|
||||||
|
``"html"``
|
||||||
|
Description
|
||||||
|
Select the gallery metadata source.
|
||||||
|
|
||||||
|
* ``"api"``: Get data from the `API <https://ehwiki.org/wiki/API>`_.
|
||||||
|
* ``"html"``: Extract data from HTML.
|
||||||
|
|
||||||
|
|
||||||
extractor.exhentai.original
|
extractor.exhentai.original
|
||||||
---------------------------
|
---------------------------
|
||||||
Type
|
Type
|
||||||
|
@ -182,9 +182,6 @@ class ExhentaiGalleryExtractor(ExhentaiExtractor):
|
|||||||
gpage = self._gallery_page()
|
gpage = self._gallery_page()
|
||||||
|
|
||||||
data = self.get_metadata(gpage)
|
data = self.get_metadata(gpage)
|
||||||
self.count = data["count"]
|
|
||||||
|
|
||||||
yield Message.Version, 1
|
|
||||||
yield Message.Directory, data
|
yield Message.Directory, data
|
||||||
|
|
||||||
images = itertools.chain(
|
images = itertools.chain(
|
||||||
@ -200,6 +197,11 @@ class ExhentaiGalleryExtractor(ExhentaiExtractor):
|
|||||||
|
|
||||||
def get_metadata(self, page):
|
def get_metadata(self, page):
|
||||||
"""Extract gallery metadata"""
|
"""Extract gallery metadata"""
|
||||||
|
if self.config("metadata") == "api":
|
||||||
|
return self.metadata_from_api()
|
||||||
|
return self.metadata_from_page(page)
|
||||||
|
|
||||||
|
def metadata_from_page(self, page):
|
||||||
extr = text.extract_from(page)
|
extr = text.extract_from(page)
|
||||||
data = {
|
data = {
|
||||||
"gallery_id" : self.gallery_id,
|
"gallery_id" : self.gallery_id,
|
||||||
@ -225,6 +227,7 @@ class ExhentaiGalleryExtractor(ExhentaiExtractor):
|
|||||||
"torrentcount" : text.parse_int(extr('>Torrent Download (', ')')),
|
"torrentcount" : text.parse_int(extr('>Torrent Download (', ')')),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self.count = data["count"]
|
||||||
data["lang"] = util.language_to_code(data["language"])
|
data["lang"] = util.language_to_code(data["language"])
|
||||||
data["tags"] = [
|
data["tags"] = [
|
||||||
text.unquote(tag.replace("+", " "))
|
text.unquote(tag.replace("+", " "))
|
||||||
@ -233,6 +236,25 @@ class ExhentaiGalleryExtractor(ExhentaiExtractor):
|
|||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
def metadata_from_api(self):
|
||||||
|
url = self.root + "/api.php"
|
||||||
|
data = {
|
||||||
|
"method": "gdata",
|
||||||
|
"gidlist": ((self.gallery_id, self.gallery_token),),
|
||||||
|
"namespace": 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
data = self.request(url, method="POST", json=data).json()
|
||||||
|
if "error" in data:
|
||||||
|
raise exception.StopExtraction(data["error"])
|
||||||
|
|
||||||
|
data = data["gmetadata"][0]
|
||||||
|
data["eh_category"] = data["category"]
|
||||||
|
data["date"] = text.parse_timestamp(data["posted"])
|
||||||
|
self.count = data["filecount"]
|
||||||
|
|
||||||
|
return data
|
||||||
|
|
||||||
def image_from_page(self, page):
|
def image_from_page(self, page):
|
||||||
"""Get image url and data from webpage"""
|
"""Get image url and data from webpage"""
|
||||||
pos = page.index('<div id="i3"><a onclick="return load_image(') + 26
|
pos = page.index('<div id="i3"><a onclick="return load_image(') + 26
|
||||||
|
Loading…
Reference in New Issue
Block a user