diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py index 655ab742..8af89012 100644 --- a/gallery_dl/extractor/common.py +++ b/gallery_dl/extractor/common.py @@ -17,6 +17,9 @@ from .. import config class Extractor(): + directory_fmt = [""] + filename_fmt = "" + def __init__(self): self.session = requests.Session() diff --git a/gallery_dl/extractor/mangahere.py b/gallery_dl/extractor/mangahere.py index eaf8af09..0348a3b6 100644 --- a/gallery_dl/extractor/mangahere.py +++ b/gallery_dl/extractor/mangahere.py @@ -15,8 +15,6 @@ import re class MangaHereMangaExtractor(Extractor): """Extract all manga-chapters from mangahere""" category = "mangahere" - directory_fmt = ["{category}", "{manga}", "c{chapter:>03}"] - filename_fmt = "{manga}_c{chapter:>03}_{page:>03}.{extension}" pattern = [r"(?:https?://)?(?:www\.)?mangahere\.co/manga/([^/]+)/?$"] def __init__(self, match): diff --git a/gallery_dl/extractor/mangamint.py b/gallery_dl/extractor/mangamint.py index cfa952ab..5c976d5a 100644 --- a/gallery_dl/extractor/mangamint.py +++ b/gallery_dl/extractor/mangamint.py @@ -15,8 +15,6 @@ import re class MangaMintMangaExtractor(Extractor): """Extract all manga-chapters from mangamint""" category = "mangamint" - directory_fmt = ["{category}", "{manga}", "c{chapter:>03}"] - filename_fmt = "{manga}_c{chapter:>03}_{page:>03}.{extension}" pattern = [r"(?:https?://)?(?:www\.)?mangamint\.com(/manga/[^\?]+-manga)"] url_base = "https://www.mangamint.com" diff --git a/gallery_dl/extractor/mangashare.py b/gallery_dl/extractor/mangashare.py index 82abd6d1..277c6f9a 100644 --- a/gallery_dl/extractor/mangashare.py +++ b/gallery_dl/extractor/mangashare.py @@ -14,8 +14,6 @@ from .. import text class MangaShareMangaExtractor(Extractor): """Extract all manga-chapters from mangashare""" category = "mangashare" - directory_fmt = ["{category}", "{manga}", "c{chapter:>03} - {title}"] - filename_fmt = "{manga}_c{chapter:>03}_{page:>03}.{extension}" pattern = [r"(?:https?://)?read\.mangashare\.com/[^/]+$"] def __init__(self, match): diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py index e96fd8c6..91a9c011 100644 --- a/gallery_dl/extractor/pixiv.py +++ b/gallery_dl/extractor/pixiv.py @@ -16,7 +16,6 @@ import time class PixivUserExtractor(Extractor): """Extract all works of a single pixiv-user""" - category = "pixiv" directory_fmt = ["{category}", "{artist-id}-{artist-nick}"] filename_fmt = "{category}_{artist-id}_{id}{num}.{extension}" @@ -133,7 +132,6 @@ class PixivUserExtractor(Extractor): class PixivWorkExtractor(PixivUserExtractor): """Extract a single pixiv work/illustration""" - pattern = [(r"(?:https?://)?(?:www\.)?pixiv\.net/member(?:_illust)?\.php" r"\?(?:[^&]+&)*illust_id=(\d+)")] @@ -153,7 +151,6 @@ class PixivWorkExtractor(PixivUserExtractor): class PixivFavoriteExtractor(PixivUserExtractor): """Extract all favorites/bookmarks of a single pixiv-user""" - directory_fmt = ["{category}", "bookmarks", "{artist-id}-{artist-nick}"] pattern = [r"(?:https?://)?(?:www\.)?pixiv\.net/bookmark\.php\?id=(\d+)"] @@ -167,7 +164,6 @@ class PixivFavoriteExtractor(PixivUserExtractor): class PixivBookmarkExtractor(PixivFavoriteExtractor): """Extract all favorites/bookmarks of your own account""" - pattern = [r"(?:https?://)?(?:www\.)?pixiv\.net/bookmark\.php()$"] def __init__(self, match): @@ -194,7 +190,6 @@ class PixivAPI(): For in-depth information regarding the Pixiv Public-API, see - http://blog.imaou.com/opensource/2014/10/09/pixiv_api_for_ios_update.html """ - token_timeout = 50*60 # 50 minutes def __init__(self, session):