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

[hentaicdn] use HTTPS

Browse Source
This commit is contained in:
Mike Fährmann
2017-08-02 18:31:21 +02:00
parent 4f1e6c109f
commit 6950708e52
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/extractor/hentai2read.py
View File

@@ -18,14 +18,15 @@ import json
class Hentai2readMangaExtractor(MangaExtractor): class Hentai2readMangaExtractor(MangaExtractor):
"""Extractor for hmanga from hentai2read.com""" """Extractor for hmanga from hentai2read.com"""
category = "hentai2read" category = "hentai2read"
scheme = "https"
pattern = [r"(?:https?://)?(?:www\.)?(hentai2read\.com/[^/]+/?)$"] pattern = [r"(?:https?://)?(?:www\.)?(hentai2read\.com/[^/]+/?)$"]
test = [ test = [
("http://hentai2read.com/amazon_elixir/", { ("http://hentai2read.com/amazon_elixir/", {
"url": "d1f87b71d3c97b49a478cdfb6ae96b2d9520ab78", "url": "273073752d418ec887d7f7211e42b832e8c403ba",
}), }),
("http://hentai2read.com/oshikage_riot/", { ("http://hentai2read.com/oshikage_riot/", {
"url": "672f34cce7bf5a855c6c38e8bc9c5117a4b3061c", "url": "6595f920a3088a15c2819c502862d45f8eb6bea6",
}) }),
] ]
def chapters(self, page): def chapters(self, page):
@@ -40,14 +41,14 @@ class Hentai2readChapterExtractor(hentaicdn.HentaicdnChapterExtractor):
category = "hentai2read" category = "hentai2read"
pattern = [r"(?:https?://)?(?:www\.)?hentai2read\.com/([^/]+)/(\d+)"] pattern = [r"(?:https?://)?(?:www\.)?hentai2read\.com/([^/]+)/(\d+)"]
test = [("http://hentai2read.com/amazon_elixir/1/", { test = [("http://hentai2read.com/amazon_elixir/1/", {
"url": "fb5fc4d7cc194116960eaa648c7e045a6e6f0c11", "url": "964b942cf492b3a129d2fe2608abfc475bc99e71",
"keyword": "c05d0d0bbe188926b15a43df1f8f65b8ac11c3fd", "keyword": "c05d0d0bbe188926b15a43df1f8f65b8ac11c3fd",
})] })]
def __init__(self, match): def __init__(self, match):
hentaicdn.HentaicdnChapterExtractor.__init__(self) hentaicdn.HentaicdnChapterExtractor.__init__(self)
url_title, self.chapter = match.groups() url_title, self.chapter = match.groups()
self.url = "http://hentai2read.com/{}/{}/".format( self.url = "https://hentai2read.com/{}/{}/".format(
url_title, self.chapter url_title, self.chapter
) )

2
gallery_dl/extractor/hentaicdn.py
View File

@@ -29,7 +29,7 @@ class HentaicdnChapterExtractor(Extractor):
yield Message.Directory, data yield Message.Directory, data
for num, part in enumerate(images, 1): for num, part in enumerate(images, 1):
data["num"] = num data["num"] = num
url = "http://hentaicdn.com/hentai" + part url = "https://hentaicdn.com/hentai" + part
yield Message.Url, url, text.nameext_from_url(url, data) yield Message.Url, url, text.nameext_from_url(url, data)
def get_job_metadata(self, page, images): def get_job_metadata(self, page, images):

2
gallery_dl/extractor/hentaihere.py
View File

@@ -39,7 +39,7 @@ class HentaihereChapterExtractor(hentaicdn.HentaicdnChapterExtractor):
category = "hentaihere" category = "hentaihere"
pattern = [r"(?:https?://)?(?:www\.)?hentaihere\.com/m/S(\d+)/(\d+)"] pattern = [r"(?:https?://)?(?:www\.)?hentaihere\.com/m/S(\d+)/(\d+)"]
test = [("https://hentaihere.com/m/S13812/1/1/", { test = [("https://hentaihere.com/m/S13812/1/1/", {
"url": "fb5fc4d7cc194116960eaa648c7e045a6e6f0c11", "url": "964b942cf492b3a129d2fe2608abfc475bc99e71",
"keyword": "e8625ccca8466a5dee089394fc29efea6d6e2950", "keyword": "e8625ccca8466a5dee089394fc29efea6d6e2950",
})] })]

4
test/test_extractors.py
View File

@@ -58,7 +58,9 @@ skip = [
"exhentai", "kissmanga", "mangafox", "dynastyscans", "nijie", "exhentai", "kissmanga", "mangafox", "dynastyscans", "nijie",
"archivedmoe", "archiveofsins", "thebarchive", "archivedmoe", "archiveofsins", "thebarchive",
# temporary issues # temporary issues
"twitter", "readcomiconline", # server down
"twitter", # ads
"yonkouprod", # everything is gone
] ]
# enable selective testing for direct calls # enable selective testing for direct calls
if __name__ == '__main__' and len(sys.argv) > 1: if __name__ == '__main__' and len(sys.argv) > 1: