", " <"),
("count" , "'>", " images"),
- ("first-url", "Porn pics of ', ' (Page 1)'),
("uploader", '>Uploaded by ', ''),
("count" , ' 1 of ', ' pics"'),
- ), values={"gallery-id": self.gid})
+ ), values={"gallery_id": self.gid})
self.image_id = text.extract(page, 'id="img_ed_', '"', pos)[0]
data["title"] = text.unescape(data["title"])
return data
@@ -74,7 +74,7 @@ class ImagefapGalleryExtractor(Extractor):
return
num += 1
_, imgid, name = imgurl.rsplit("/", 2)
- data = {"image-id": imgid, "num": num}
+ data = {"image_id": imgid, "num": num}
yield imgurl, text.nameext_from_url(name, data)
params["idx"] += 24
@@ -83,12 +83,12 @@ class ImagefapImageExtractor(Extractor):
"""Extractor for single images from imagefap.com"""
category = "imagefap"
subcategory = "image"
- directory_fmt = ["{category}", "{gallery-id} {title}"]
- filename_fmt = "{category}_{gallery-id}_{name}.{extension}"
+ directory_fmt = ["{category}", "{gallery_id} {title}"]
+ filename_fmt = "{category}_{gallery_id}_{name}.{extension}"
pattern = [r"(?:https?://)?(?:www\.)?imagefap\.com/photo/(\d+)"]
test = [("http://www.imagefap.com/photo/1616331218/", {
"url": "8a05c0ccdcf84e63c962803bc41d247628c549ea",
- "keyword": "c9880c6731b3fdc6d98d25dbff56f4342c11683e",
+ "keyword": "c5023841c72b88949786c231f472f51453103185",
"content": "964b8c62c9d5c2a039a2fccf1b1e10aaf7a18a96",
})]
@@ -113,8 +113,8 @@ class ImagefapImageExtractor(Extractor):
"date": info["datePublished"],
"width": info["width"],
"height": info["height"],
- "gallery-id": parts[1],
- "image-id": parts[2],
+ "gallery_id": parts[1],
+ "image_id": parts[2],
})
def load_json(self):
@@ -136,8 +136,8 @@ class ImagefapUserExtractor(Extractor):
"""Extractor for all galleries from a user at imagefap.com"""
category = "imagefap"
subcategory = "user"
- directory_fmt = ["{category}", "{gallery-id} {title}"]
- filename_fmt = "{category}_{gallery-id}_{name}.{extension}"
+ directory_fmt = ["{category}", "{gallery_id} {title}"]
+ filename_fmt = "{category}_{gallery_id}_{name}.{extension}"
pattern = [(r"(?:https?://)?(?:www\.)?imagefap\.com/"
r"profile(?:\.php\?user=|/)([^/]+)"),
(r"(?:https?://)?(?:www\.)?imagefap\.com/"
@@ -161,7 +161,7 @@ class ImagefapUserExtractor(Extractor):
yield Message.Queue, "http://www.imagefap.com/gallery/" + gallery
def get_gallery_ids(self):
- """Yield all gallery-ids of a specific user"""
+ """Yield all gallery_ids of a specific user"""
folders = self.get_gallery_folders()
url = "http://www.imagefap.com/ajax_usergallery_folder.php"
params = {"userid": self.user_id}
@@ -171,7 +171,7 @@ class ImagefapUserExtractor(Extractor):
yield from text.extract_iter(page, '", "")[0]
title, _, count = title.rpartition(" - ")
return {
- "gallery-key": self.key,
+ "gallery_key": self.key,
"title": text.unescape(title),
"count": count[:-7],
}
@@ -66,7 +66,7 @@ class ImgboxGalleryExtractor(AsynchronousExtractor):
return text.extract_all(page, (
("num" , ' ', ' of '),
(None , 'class="image-container"', ''),
- ("image-key", 'alt="', '"'),
+ ("image_key", 'alt="', '"'),
("filename" , ' title="', '"'),
), values=self.metadata.copy())[0]
@@ -86,7 +86,7 @@ class ImgboxImageExtractor(Extractor):
test = [
("https://imgbox.com/qHhw7lpG", {
"url": "b9556dc307edf88e016fbced6d354702bc236070",
- "keyword": "ff0524dba869a4b3292d7d4f72f5da4024b4f002",
+ "keyword": "a5cdcdf6e784bb186ed65a0cd7978ae2d0e17a12",
"content": "0c8768055e4e20e7c7259608b67799171b691140",
}),
("https://imgbox.com/qHhw7lpH", {
@@ -104,7 +104,7 @@ class ImgboxImageExtractor(Extractor):
if not url:
raise exception.NotFoundError("image")
filename, pos = text.extract(page, ' title="', '"', pos)
- data = text.nameext_from_url(filename, {"image-key": self.key})
+ data = text.nameext_from_url(filename, {"image_key": self.key})
yield Message.Version, 1
yield Message.Directory, data
yield Message.Url, "https://i." + url, data
diff --git a/gallery_dl/extractor/imgchili.py b/gallery_dl/extractor/imgchili.py
index 2c61b431..1b8838b4 100644
--- a/gallery_dl/extractor/imgchili.py
+++ b/gallery_dl/extractor/imgchili.py
@@ -48,7 +48,7 @@ class ImgchiliImageExtractor(ImgchiliExtractor):
test = [(("http://imgchili.net/show/89427/"
"89427136_test___quot;___gt;.png"), {
"url": "b93d92a6b58eb30a7ff6f9729cb748d25fea0c86",
- "keyword": "376c4584dfae7d7d2e88687d4ee9618bbfd0a35c",
+ "keyword": "9c584f848766e4cc71d9e7f5f1f849e296ec05ae",
})]
def get_job_metadata(self, page):
@@ -59,7 +59,7 @@ class ImgchiliImageExtractor(ImgchiliExtractor):
parts = name2.split("in the gallery ")
name = parts[0] if not parts[0].endswith("...") else name1
return text.nameext_from_url(name, {
- "image-id": self.match.group(1),
+ "image_id": self.match.group(1),
"title": text.unescape(parts[-1]) if len(parts) > 1 else ""
})
@@ -75,7 +75,7 @@ class ImgchiliAlbumExtractor(ImgchiliExtractor):
pattern = [r"(?:https?://)?(?:www\.)?imgchili\.net/album/([^/]+)"]
test = [("http://imgchili.net/album/7a3824c59f77c8d39b260f9168d4b49b", {
"url": "995e32b62c36d48b02ef4c7a7a19463924391e2a",
- "keyword": "2d065bd7f822de4c0b7598679f2730e0082a617e",
+ "keyword": "ae0c56cfd1fe032e5bc22f1188767b2a923ae25e",
})]
def get_job_metadata(self, page):
@@ -95,5 +95,5 @@ class ImgchiliAlbumExtractor(ImgchiliExtractor):
return
imgid, pos = text.extract(page, ' alt="', '_', pos)
name , pos = text.extract(page, '', '', pos)
- data = text.nameext_from_url(name, {"image-id": imgid, "num": num})
+ data = text.nameext_from_url(name, {"image_id": imgid, "num": num})
yield "http://i" + url + data["extension"], data
diff --git a/gallery_dl/extractor/imgth.py b/gallery_dl/extractor/imgth.py
index bc4bf1ac..689c3740 100644
--- a/gallery_dl/extractor/imgth.py
+++ b/gallery_dl/extractor/imgth.py
@@ -16,12 +16,12 @@ class ImgthGalleryExtractor(Extractor):
"""Extractor for image galleries from imgth.com"""
category = "imgth"
subcategory = "gallery"
- directory_fmt = ["{category}", "{gallery-id} {title}"]
- filename_fmt = "{category}_{gallery-id}_{num:>03}.{extension}"
+ directory_fmt = ["{category}", "{gallery_id} {title}"]
+ filename_fmt = "{category}_{gallery_id}_{num:>03}.{extension}"
pattern = [r"(?:https?://)?imgth\.com/gallery/(\d+)"]
test = [("http://imgth.com/gallery/37/wallpaper-anime", {
"url": "4ae1d281ca2b48952cf5cca57e9914402ad72748",
- "keyword": "3f268fcc18d49ac3799a8f25cc08053e90891955",
+ "keyword": "e62d14f20ded393d28c2789fcc34ea2c30bc6a7c",
})]
def __init__(self, match):
@@ -62,4 +62,4 @@ class ImgthGalleryExtractor(Extractor):
("date" , 'created on ', ' by <'),
(None , 'href="/users/', ''),
("user" , '>', '<'),
- ), values={"gallery-id": self.gid})[0]
+ ), values={"gallery_id": self.gid})[0]
diff --git a/gallery_dl/extractor/kissmanga.py b/gallery_dl/extractor/kissmanga.py
index 0e47d27d..53900d1b 100644
--- a/gallery_dl/extractor/kissmanga.py
+++ b/gallery_dl/extractor/kissmanga.py
@@ -25,8 +25,8 @@ class KissmangaExtractor(Extractor):
"""Base class for kissmanga extractors"""
category = "kissmanga"
directory_fmt = ["{category}", "{manga}",
- "c{chapter:>03}{chapter-minor} - {title}"]
- filename_fmt = ("{manga}_c{chapter:>03}{chapter-minor}_"
+ "c{chapter:>03}{chapter_minor} - {title}"]
+ filename_fmt = ("{manga}_c{chapter:>03}{chapter_minor}_"
"{page:>03}.{extension}")
root = "http://kissmanga.com"
@@ -60,15 +60,15 @@ class KissmangaChapterExtractor(KissmangaExtractor):
test = [
("http://kissmanga.com/Manga/Dropout/Ch-000---Oneshot-?id=145847", {
"url": "4136bcd1c6cecbca8cc2bc965d54f33ef0a97cc0",
- "keyword": "ab332093a4f2e473a468235bfd624cbe3b19fd7f",
+ "keyword": "97cc9e513953e20d6309648df57a52a7ced59ae0",
}),
("http://kissmanga.com/Manga/Urban-Tales/a?id=256717", {
"url": "de074848f6c1245204bb9214c12bcc3ecfd65019",
- "keyword": "013aad80e578c6ccd2e1fe47cdc27c12a64f6db2",
+ "keyword": "3d96653188b761752c38b60d6e397e2ace0ea04c",
}),
("http://kissmanga.com/Manga/Monster/Monster-79?id=7608", {
"url": "6abec8178f35fe7846586280ca9e38eacc32452c",
- "keyword": "ca7a07ecfd9525c0f825dc747f520306611d6af9",
+ "keyword": "2ae18e456a4a7e4a2889af49d5f2e9c10fbc45e6",
}),
("http://kissmanga.com/mAnGa/mOnStEr/Monster-79?id=7608", None),
]
@@ -95,7 +95,7 @@ class KissmangaChapterExtractor(KissmangaExtractor):
"manga": manga,
"volume": match.group(1) or "",
"chapter": match.group(2) or match.group(5),
- "chapter-minor": "."+chminor if chminor else "",
+ "chapter_minor": "."+chminor if chminor else "",
"title": match.group(4) or "",
"lang": "en",
"language": "English",
diff --git a/gallery_dl/extractor/luscious.py b/gallery_dl/extractor/luscious.py
index 7e2c3e79..4e17ba07 100644
--- a/gallery_dl/extractor/luscious.py
+++ b/gallery_dl/extractor/luscious.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright 2016 Mike Fährmann
+# Copyright 2016-2017 Mike Fährmann
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@@ -16,20 +16,20 @@ class LusciousAlbumExtractor(AsynchronousExtractor):
"""Extractor for image albums from luscious.net"""
category = "luscious"
subcategory = "album"
- directory_fmt = ["{category}", "{gallery-id} {title}"]
- filename_fmt = "{category}_{gallery-id}_{num:>03}.{extension}"
+ directory_fmt = ["{category}", "{gallery_id} {title}"]
+ filename_fmt = "{category}_{gallery_id}_{num:>03}.{extension}"
pattern = [(r"(?:https?://)?(?:www\.)?luscious\.net/"
r"(?:c/[^/]+/)?(?:pictures/album|albums)/([^/]+_(\d+))")]
test = [
(("https://luscious.net/c/hentai_manga/albums/"
"okinami-no-koigokoro_277031/view/"), {
"url": "7e4984a271a1072ac6483e4228a045895aff86f3",
- "keyword": "8533c72ff85578240cf7594eb617d907bebf87ab",
+ "keyword": "76e099479b180420fd5cf820f00c52fe07fda884",
"content": "b3a747a6464509440bd0ff6d1267e6959f8d6ff3",
}),
("https://luscious.net/albums/virgin-killer-sweater_282582/", {
"url": "01e2d7dd6eecea0152610f2446a6b1d60519c8bd",
- "keyword": "6c8750df7f38ff4e15cabc9a3a2e876b84a328d6",
+ "keyword": "02624ff1097260e2a3c1b220afc92ea4c6b109b3",
}),
("https://luscious.net/albums/okinami-no-koigokoro_277031/", None),
]
@@ -58,7 +58,7 @@ class LusciousAlbumExtractor(AsynchronousExtractor):
(None , 'Section:', ''), ("section" , '>', '<'), ("language", '
Language:', ' '), - ), values={"gallery-id": self.gid})[0] + ), values={"gallery_id": self.gid})[0] data["lang"] = util.language_to_code(data["language"]) try: data["artist"] = text.extract(data["tags"], "rtist: ", ",")[0] @@ -84,6 +84,6 @@ class LusciousAlbumExtractor(AsynchronousExtractor): "num": num, "name": name, "extension": iurl.rpartition(".")[2], - "image-id": imgid, + "image_id": imgid, } num += 1 diff --git a/gallery_dl/extractor/mangafox.py b/gallery_dl/extractor/mangafox.py index 8fc9b655..9bba6693 100644 --- a/gallery_dl/extractor/mangafox.py +++ b/gallery_dl/extractor/mangafox.py @@ -17,14 +17,14 @@ class MangafoxChapterExtractor(AsynchronousExtractor): """Extractor for manga-chapters from mangafox.me""" category = "mangafox" subcategory = "chapter" - directory_fmt = ["{category}", "{manga}", "c{chapter:>03}{chapter-minor}"] + directory_fmt = ["{category}", "{manga}", "c{chapter:>03}{chapter_minor}"] filename_fmt = ("{manga}_c{chapter:>03}{chapter-minor}_" "{page:>03}.{extension}") pattern = [(r"(?:https?://)?(?:www\.)?(mangafox\.me/manga/" r"[^/]+/(v\d+/)?c\d+[^/]*)")] test = [(("http://mangafox.me/manga/kidou_keisatsu_patlabor/" "v05/c006.2/1.html"), { - "keyword": "3bae0396e96868f5f24dff5e547a6bbfcbed7282", + "keyword": "ef2757d6136ef6b02eafe12d98a05f189fe8b2ba", "content": "5c50c252dcf12ffecf68801f4db8a2167265f66c", })] @@ -59,7 +59,7 @@ class MangafoxChapterExtractor(AsynchronousExtractor): match = re.match(r"(v0*(\d+)/)?c0*(\d+)(.*)", data["chapter"]) data["volume"] = match.group(2) or "" data["chapter"] = match.group(3) - data["chapter-minor"] = match.group(4) or "" + data["chapter_minor"] = match.group(4) or "" data["manga"] = data["manga"].rpartition(" ")[0] return data diff --git a/gallery_dl/extractor/mangahere.py b/gallery_dl/extractor/mangahere.py index f6078baa..c129efc1 100644 --- a/gallery_dl/extractor/mangahere.py +++ b/gallery_dl/extractor/mangahere.py @@ -32,13 +32,13 @@ class MangahereChapterExtractor(AsynchronousExtractor): """Extractor for manga-chapters from mangahere.co""" category = "mangahere" subcategory = "chapter" - directory_fmt = ["{category}", "{manga}", "c{chapter:>03}{chapter-minor}"] - filename_fmt = ("{manga}_c{chapter:>03}{chapter-minor}_" + directory_fmt = ["{category}", "{manga}", "c{chapter:>03}{chapter_minor}"] + filename_fmt = ("{manga}_c{chapter:>03}{chapter_minor}_" "{page:>03}.{extension}") pattern = [(r"(?:https?://)?(?:www\.)?mangahere\.co/manga/" r"([^/]+(?:/v0*(\d+))?/c0*(\d+)(\.\d+)?)")] test = [("http://www.mangahere.co/manga/dongguo_xiaojie/c003.2/", { - "keyword": "d3fe470e934a9f02ed00d4391b1743970eae82fa", + "keyword": "8cb9f9512b68d2cdcbea2419592b9247304c149b", "content": "dd8454469429c6c717cbc3cad228e76ef8c6e420", })] url_fmt = "http://www.mangahere.co/manga/{}/{}.html" @@ -74,8 +74,8 @@ class MangahereChapterExtractor(AsynchronousExtractor): # "title": TODO, "volume": self.volume or "", "chapter": self.chapter, - "chapter-minor": self.chminor or "", - "chapter-id": chid, + "chapter_minor": self.chminor or "", + "chapter_id": chid, "count": count, "lang": "en", "language": "English", diff --git a/gallery_dl/extractor/mangapanda.py b/gallery_dl/extractor/mangapanda.py index 1b21637c..56cb1ce0 100644 --- a/gallery_dl/extractor/mangapanda.py +++ b/gallery_dl/extractor/mangapanda.py @@ -35,5 +35,5 @@ class MangapandaChapterExtractor(MangapandaBase, MangareaderChapterExtractor): ] test = [("http://www.mangapanda.com/red-storm/2", { "url": "4bf4ddf6c50105ec8a37675495ab80c46608275d", - "keyword": "89c712f7ed255ec9c1d8e84dcb5a160b6cb4498c", + "keyword": "16c881a09f5cf0f2c1c374665b667d1f26b20c22", })] diff --git a/gallery_dl/extractor/mangapark.py b/gallery_dl/extractor/mangapark.py index 790249a2..ef3c4be7 100644 --- a/gallery_dl/extractor/mangapark.py +++ b/gallery_dl/extractor/mangapark.py @@ -32,24 +32,24 @@ class MangaparkChapterExtractor(Extractor): category = "mangapark" subcategory = "chapter" directory_fmt = ["{category}", "{manga}", - "c{chapter:>03}{chapter-minor} - {title}"] - filename_fmt = ("{manga}_c{chapter:>03}{chapter-minor}_" + "c{chapter:>03}{chapter_minor} - {title}"] + filename_fmt = ("{manga}_c{chapter:>03}{chapter_minor}_" "{page:>03}.{extension}") pattern = [(r"(?:https?://)?(?:www\.)?mangapark\.me/manga/" r"([^/]+/s(\d+)(?:/v([^/]+))?/c(\d+)(?:([^/]+)|/e(\d+))?)")] test = [ ("http://mangapark.me/manga/gosu/s2/c55", { "count": 50, - "keyword": "bd97ca24ef344b44292910384215ef3f1005ea2e", + "keyword": "b2216c0b8621a86be51eced72a2a61ba9f47e11e", }), (("http://mangapark.me/manga/" "ad-astra-per-aspera-hata-kenjirou/s1/c1.2"), { "count": 40, - "keyword": "f28eb26b4966bebda0e761f241c2dd49e505ce13", + "keyword": "257d90d582b8f259380a61a0774ff2c4ae5b3986", }), ("http://mangapark.me/manga/gekkan-shoujo-nozaki-kun/s2/c70/e2/1", { "count": 15, - "keyword": "34aa6ca3bdf5078f839cbf68ff68e39728cf248b", + "keyword": "cf5329984c062058133e12ee3fe4a53fb734ed4c", }), ] @@ -80,13 +80,13 @@ class MangaparkChapterExtractor(Extractor): "version": self.version, "volume": self.volume or "", "chapter": self.chapter, - "chapter-minor": self.chminor or "", + "chapter_minor": self.chminor or "", "lang": "en", "language": "English", } data = text.extract_all(page, ( - ("manga-id" , "var _manga_id = '", "'"), - ("chapter-id", "var _book_id = '", "'"), + ("manga_id" , "var _manga_id = '", "'"), + ("chapter_id", "var _book_id = '", "'"), ("manga" , "