From 9986a5ffb50f3ffc5e9d91f6f8fe36fdf278d131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 3 Oct 2015 20:23:55 +0200 Subject: [PATCH 1/6] json-based config module --- gallery_dl/config.py | 90 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 gallery_dl/config.py diff --git a/gallery_dl/config.py b/gallery_dl/config.py new file mode 100644 index 00000000..549e40e9 --- /dev/null +++ b/gallery_dl/config.py @@ -0,0 +1,90 @@ +# -*- coding: utf-8 -*- + +# Copyright 2015 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 +# published by the Free Software Foundation. + +"""Global configuration module""" + +import sys +import json +import os.path +import platform + +# -------------------------------------------------------------------- +# public interface + +def load(*files): + """Load JSON configuration files""" + configfiles = files or _default_configs + for conf in configfiles: + try: + path = os.path.expanduser(conf) + with open(path) as file: + confdict = json.load(file) + _config.update(confdict) + except FileNotFoundError: + continue + except json.decoder.JSONDecodeError as exception: + print("Error while loading '", path, "':", sep="", file=sys.stderr) + print(exception, file=sys.stderr) + +def clear(): + """Reset configuration to en empty state""" + globals()["_config"] = {} + +def get(key, default=None): + """Get the value of property 'key' or a default-value if it doenst exist""" + conf = _config + try: + for k in key.split("."): + conf = conf[k] + return conf + except (KeyError, AttributeError): + return default + +def interpolate(key, default=None): + """Interpolate the value of 'key'""" + conf = _config + keys = key.split(".") + try: + for k in keys: + default = conf.get(keys[-1], default) + conf = conf[k] + return conf + except (KeyError, AttributeError): + return default + +def set(key, value): + """Set the value of property 'key' for this session""" + conf = _config + keys = key.split(".") + for k in keys[:-1]: + try: + conf = conf[k] + except KeyError: + temp = {} + conf[k] = temp + conf = temp + conf[keys[-1]] = value + + +# -------------------------------------------------------------------- +# internals + +_config = {} + +if platform.system() == "Windows": + _default_configs = [ + r"~\.config\gallery-dl.conf", + r"~\.gallery-dl.conf", + ] +else: + _default_configs = [ + "/etc/gallery-dl.conf", + "~/.config/gallery/config.json", + "~/.config/gallery-dl.conf", + "~/.gallery-dl.conf", + ] From 7ac106096f8da32aa20bc2c4f18730d88345786a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 3 Oct 2015 20:24:28 +0200 Subject: [PATCH 2/6] add tests for config-module --- test/test_config.py | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 test/test_config.py diff --git a/test/test_config.py b/test/test_config.py new file mode 100644 index 00000000..3aaeb42c --- /dev/null +++ b/test/test_config.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# Copyright 2015 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 +# published by the Free Software Foundation. + +import unittest +import gallery_dl.config as config +import os +import tempfile + +class TestConfig(unittest.TestCase): + + def setUp(self): + fd, self._configfile = tempfile.mkstemp() + with os.fdopen(fd, "w") as file: + file.write('{"a": "1", "b": {"c": "text"}}') + config.load(self._configfile) + + def tearDown(self): + config.clear() + os.remove(self._configfile) + + def test_get(self): + self.assertEqual(config.get("a"), "1") + self.assertEqual(config.get("b.c"), "text") + self.assertEqual(config.get("d"), None) + self.assertEqual(config.get("e.f.g", 123), 123) + + def test_set(self): + config.set("b.c", [1, 2, 3]) + config.set("e.f.g", 234) + self.assertEqual(config.get("b.c"), [1, 2, 3]) + self.assertEqual(config.get("e.f.g"), 234) + + def test_interpolate(self): + self.assertEqual(config.interpolate("a"), "1") + self.assertEqual(config.interpolate("b.a"), "1") + self.assertEqual(config.interpolate("b.c", "2"), "text") + self.assertEqual(config.interpolate("b.d", "2"), "2") + config.set("d", 123) + self.assertEqual(config.interpolate("b.d", "2"), 123) + self.assertEqual(config.interpolate("d.d", "2"), 123) + +if __name__ == '__main__': + unittest.main() From 2026223ed10d1461ca7327b7b8aaa347b72c5b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 5 Oct 2015 12:42:42 +0200 Subject: [PATCH 3/6] change argument format for config-calls --- gallery_dl/config.py | 10 ++++------ test/test_config.py | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/gallery_dl/config.py b/gallery_dl/config.py index 549e40e9..9a02f307 100644 --- a/gallery_dl/config.py +++ b/gallery_dl/config.py @@ -35,20 +35,19 @@ def clear(): """Reset configuration to en empty state""" globals()["_config"] = {} -def get(key, default=None): +def get(keys, default=None): """Get the value of property 'key' or a default-value if it doenst exist""" conf = _config try: - for k in key.split("."): + for k in keys: conf = conf[k] return conf except (KeyError, AttributeError): return default -def interpolate(key, default=None): +def interpolate(keys, default=None): """Interpolate the value of 'key'""" conf = _config - keys = key.split(".") try: for k in keys: default = conf.get(keys[-1], default) @@ -57,10 +56,9 @@ def interpolate(key, default=None): except (KeyError, AttributeError): return default -def set(key, value): +def set(keys, value): """Set the value of property 'key' for this session""" conf = _config - keys = key.split(".") for k in keys[:-1]: try: conf = conf[k] diff --git a/test/test_config.py b/test/test_config.py index 3aaeb42c..f8017626 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -25,25 +25,25 @@ class TestConfig(unittest.TestCase): os.remove(self._configfile) def test_get(self): - self.assertEqual(config.get("a"), "1") - self.assertEqual(config.get("b.c"), "text") - self.assertEqual(config.get("d"), None) - self.assertEqual(config.get("e.f.g", 123), 123) + self.assertEqual(config.get(["a"]), "1") + self.assertEqual(config.get(["b", "c"]), "text") + self.assertEqual(config.get(["d"]), None) + self.assertEqual(config.get(["e", "f", "g"], 123), 123) def test_set(self): - config.set("b.c", [1, 2, 3]) - config.set("e.f.g", 234) - self.assertEqual(config.get("b.c"), [1, 2, 3]) - self.assertEqual(config.get("e.f.g"), 234) + config.set(["b", "c"], [1, 2, 3]) + config.set(["e", "f", "g"], value=234) + self.assertEqual(config.get(["b", "c"]), [1, 2, 3]) + self.assertEqual(config.get(["e", "f", "g"]), 234) def test_interpolate(self): - self.assertEqual(config.interpolate("a"), "1") - self.assertEqual(config.interpolate("b.a"), "1") - self.assertEqual(config.interpolate("b.c", "2"), "text") - self.assertEqual(config.interpolate("b.d", "2"), "2") - config.set("d", 123) - self.assertEqual(config.interpolate("b.d", "2"), 123) - self.assertEqual(config.interpolate("d.d", "2"), 123) + self.assertEqual(config.interpolate(["a"]), "1") + self.assertEqual(config.interpolate(["b", "a"]), "1") + self.assertEqual(config.interpolate(["b", "c"], "2"), "text") + self.assertEqual(config.interpolate(["b", "d"], "2"), "2") + config.set(["d"], 123) + self.assertEqual(config.interpolate(["b", "d"], "2"), 123) + self.assertEqual(config.interpolate(["d", "d"], "2"), 123) if __name__ == '__main__': unittest.main() From 608d3193a9f8137e4d5f116251dde23aa8e358c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 5 Oct 2015 13:26:38 +0200 Subject: [PATCH 4/6] use new config-module in downloader --- gallery_dl/__init__.py | 16 +++------------- gallery_dl/download.py | 39 +++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py index aed11666..b0cebaed 100644 --- a/gallery_dl/__init__.py +++ b/gallery_dl/__init__.py @@ -17,9 +17,7 @@ __email__ = "mike_faehrmann@web.de" import os import sys import argparse -import configparser - -from .download import DownloadManager +from . import config, download def parse_cmdline_options(): parser = argparse.ArgumentParser( @@ -41,18 +39,10 @@ def parse_cmdline_options(): ) return parser.parse_args() -def parse_config_file(path): - config = configparser.ConfigParser( - interpolation=None, - ) - config.optionxform = lambda opt: opt - config.read(os.path.expanduser(path)) - return config - def main(): + config.load() opts = parse_cmdline_options() - conf = parse_config_file(opts.config) - dlmgr = DownloadManager(opts, conf) + dlmgr = download.DownloadManager(opts) try: for url in opts.urls: diff --git a/gallery_dl/download.py b/gallery_dl/download.py index 96ababa5..7fdfacfd 100644 --- a/gallery_dl/download.py +++ b/gallery_dl/download.py @@ -12,14 +12,14 @@ import re import importlib from .extractor.common import Message +from . import config class DownloadManager(): - def __init__(self, opts, config): + def __init__(self, opts): self.opts = opts - self.config = config self.modules = {} - self.extractors = ExtractorFinder(config) + self.extractors = ExtractorFinder() def add(self, url): job = DownloadJob(self, url) @@ -38,7 +38,7 @@ class DownloadManager(): if self.opts.dest: return self.opts.dest else: - return self.config.get("general", "destination", fallback="/tmp/") + return config.get(("base-directory",), default="/tmp/") class DownloadJob(): @@ -50,16 +50,14 @@ class DownloadJob(): return self.directory = mngr.get_base_directory() self.downloaders = {} - self.filename_fmt = mngr.config.get( - self.info["category"], "filename", - fallback=self.info["filename"] + self.filename_fmt = config.get( + ("extractor", self.info["category"], "filename"), + default=self.info["filename"] + ) + segments = config.get( + ("extractor", self.info["category"], "directory"), + default=self.info["directory"] ) - try: - segments = mngr.config.get( - self.info["category"], "directory" - ).split("/") - except Exception: - segments = self.info["directory"] self.directory_fmt = os.path.join(*segments) def run(self): @@ -144,26 +142,23 @@ class DownloadJob(): class ExtractorFinder(): - def __init__(self, config): - self.config = config - def get_for_url(self, url): """Get an extractor-instance suitable for 'url'""" name, match = self.find_pattern_match(url) if match: module = importlib.import_module(".extractor." + name, __package__) klass = getattr(module, module.info["extractor"]) - return klass(match, self.config), module.info + return klass(match, {}), module.info else: print("no suitable extractor found") return None, None def find_pattern_match(self, url): - """Find a pattern, that matches 'url', and return the (category,match) tuple""" - for category in self.config: - for key, value in self.config[category].items(): - if key.startswith("regex"): - match = re.match(value, url) + """Find a pattern that matches 'url' and return the (category,match) tuple""" + for category in config.get(("extractor",)): + patterns = config.get(("extractor", category, "pattern"), default=[]) + for pattern in patterns: + match = re.match(pattern, url) if match: return category, match for category, info in self.extractor_metadata(): From 3c13548f29502398b1cf785ecc44c3df57a696a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 5 Oct 2015 15:35:48 +0200 Subject: [PATCH 5/6] rewrite extractors to use config-module --- gallery_dl/download.py | 10 ++++------ gallery_dl/extractor/3dbooru.py | 4 ++-- gallery_dl/extractor/4chan.py | 4 ++-- gallery_dl/extractor/8chan.py | 4 ++-- gallery_dl/extractor/batoto.py | 4 ++-- gallery_dl/extractor/booru.py | 4 ++-- gallery_dl/extractor/chan.py | 5 ++--- gallery_dl/extractor/common.py | 8 ++++---- gallery_dl/extractor/danbooru.py | 4 ++-- gallery_dl/extractor/e621.py | 4 ++-- gallery_dl/extractor/gelbooru.py | 4 ++-- gallery_dl/extractor/imagebam.py | 4 ++-- gallery_dl/extractor/imgbox.py | 4 ++-- gallery_dl/extractor/imgchili.py | 4 ++-- gallery_dl/extractor/mangareader.py | 4 ++-- gallery_dl/extractor/nijie.py | 20 +++++++++++--------- gallery_dl/extractor/pixiv.py | 11 +++++------ gallery_dl/extractor/redhawkscans.py | 4 ++-- gallery_dl/extractor/yandere.py | 4 ++-- 19 files changed, 54 insertions(+), 56 deletions(-) diff --git a/gallery_dl/download.py b/gallery_dl/download.py index 7fdfacfd..f1ba96d6 100644 --- a/gallery_dl/download.py +++ b/gallery_dl/download.py @@ -112,13 +112,11 @@ class DownloadJob(): scheme = url[:pos] if pos != -1 else "http" if scheme == "https": scheme = "http" - downloader = self.downloaders.get(scheme) if downloader is None: module = self.mngr.get_downloader_module(scheme) downloader = module.Downloader() self.downloaders[scheme] = downloader - return downloader @staticmethod @@ -148,7 +146,7 @@ class ExtractorFinder(): if match: module = importlib.import_module(".extractor." + name, __package__) klass = getattr(module, module.info["extractor"]) - return klass(match, {}), module.info + return klass(match), module.info else: print("no suitable extractor found") return None, None @@ -158,9 +156,9 @@ class ExtractorFinder(): for category in config.get(("extractor",)): patterns = config.get(("extractor", category, "pattern"), default=[]) for pattern in patterns: - match = re.match(pattern, url) - if match: - return category, match + match = re.match(pattern, url) + if match: + return category, match for category, info in self.extractor_metadata(): for pattern in info["pattern"]: match = re.match(pattern, url) diff --git a/gallery_dl/extractor/3dbooru.py b/gallery_dl/extractor/3dbooru.py index a17b954c..665c1e01 100644 --- a/gallery_dl/extractor/3dbooru.py +++ b/gallery_dl/extractor/3dbooru.py @@ -22,8 +22,8 @@ info = { class ThreeDeeBooruExtractor(JSONBooruExtractor): - def __init__(self, match, config): - JSONBooruExtractor.__init__(self, match, config, info) + def __init__(self, match): + JSONBooruExtractor.__init__(self, match, info) self.api_url = "http://behoimi.org/post/index.json" self.headers = { "Referer": "http://behoimi.org/post/show/", diff --git a/gallery_dl/extractor/4chan.py b/gallery_dl/extractor/4chan.py index 028ab7de..9aab90a2 100644 --- a/gallery_dl/extractor/4chan.py +++ b/gallery_dl/extractor/4chan.py @@ -25,8 +25,8 @@ class FourChanExtractor(ChanExtractor): api_url = "https://a.4cdn.org/{board}/thread/{thread}.json" file_url = "https://i.4cdn.org/{board}/{tim}{ext}" - def __init__(self, match, config): + def __init__(self, match): ChanExtractor.__init__( - self, config, info["category"], + self, info["category"], match.group(1), match.group(2) ) diff --git a/gallery_dl/extractor/8chan.py b/gallery_dl/extractor/8chan.py index 559951fa..43d34de5 100644 --- a/gallery_dl/extractor/8chan.py +++ b/gallery_dl/extractor/8chan.py @@ -25,8 +25,8 @@ class InfinityChanExtractor(ChanExtractor): api_url = "https://8ch.net/{board}/res/{thread}.json" file_url = "https://media.8ch.net/{board}/src/{tim}{ext}" - def __init__(self, match, config): + def __init__(self, match): ChanExtractor.__init__( - self, config, info["category"], + self, info["category"], match.group(1), match.group(2) ) diff --git a/gallery_dl/extractor/batoto.py b/gallery_dl/extractor/batoto.py index 65bc7c3d..640df8ac 100644 --- a/gallery_dl/extractor/batoto.py +++ b/gallery_dl/extractor/batoto.py @@ -27,8 +27,8 @@ class BatotoExtractor(AsynchronousExtractor): url_base = "http://bato.to/read/_/" - def __init__(self, match, config): - AsynchronousExtractor.__init__(self, config) + def __init__(self, match): + AsynchronousExtractor.__init__(self) self.chapter_id = match.group(1) def items(self): diff --git a/gallery_dl/extractor/booru.py b/gallery_dl/extractor/booru.py index f72bc789..14629fd6 100644 --- a/gallery_dl/extractor/booru.py +++ b/gallery_dl/extractor/booru.py @@ -19,8 +19,8 @@ class BooruExtractor(SequentialExtractor): api_url = "" - def __init__(self, match, config, info): - SequentialExtractor.__init__(self, config) + def __init__(self, match, info): + SequentialExtractor.__init__(self) self.info = info self.tags = text.unquote(match.group(1)) self.page = "page" diff --git a/gallery_dl/extractor/chan.py b/gallery_dl/extractor/chan.py index 2d2b6fb4..c6389314 100644 --- a/gallery_dl/extractor/chan.py +++ b/gallery_dl/extractor/chan.py @@ -10,15 +10,14 @@ from .common import SequentialExtractor, Message from .. import text -import re class ChanExtractor(SequentialExtractor): api_url = "" file_url = "" - def __init__(self, config, category, board, thread): - SequentialExtractor.__init__(self, config) + def __init__(self, category, board, thread): + SequentialExtractor.__init__(self) self.metadata = { "category": category, "board": board, diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py index b364d870..4d5b96a9 100644 --- a/gallery_dl/extractor/common.py +++ b/gallery_dl/extractor/common.py @@ -12,7 +12,7 @@ import time import queue import requests import threading -import html.parser +from .. import config class Message(): @@ -47,15 +47,15 @@ class Extractor(): class SequentialExtractor(Extractor): - def __init__(self, _): + def __init__(self): Extractor.__init__(self) class AsynchronousExtractor(Extractor): - def __init__(self, config): + def __init__(self): Extractor.__init__(self) - queue_size = int(config.get("general", "queue-size", fallback=5)) + queue_size = int(config.get(("queue-size",), default=5)) self.__queue = queue.Queue(maxsize=queue_size) self.__thread = threading.Thread(target=self.async_items, daemon=True) diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py index 3e94cd65..5024020f 100644 --- a/gallery_dl/extractor/danbooru.py +++ b/gallery_dl/extractor/danbooru.py @@ -22,6 +22,6 @@ info = { class DanbooruExtractor(JSONBooruExtractor): - def __init__(self, match, config): - JSONBooruExtractor.__init__(self, match, config, info) + def __init__(self, match): + JSONBooruExtractor.__init__(self, match, info) self.api_url = "https://danbooru.donmai.us/posts.json" diff --git a/gallery_dl/extractor/e621.py b/gallery_dl/extractor/e621.py index 3851e447..af4971e8 100644 --- a/gallery_dl/extractor/e621.py +++ b/gallery_dl/extractor/e621.py @@ -23,6 +23,6 @@ info = { class E621Extractor(JSONBooruExtractor): - def __init__(self, match, config): - JSONBooruExtractor.__init__(self, match, config, info) + def __init__(self, match): + JSONBooruExtractor.__init__(self, match, info) self.api_url = "https://e621.net/post/index.json" diff --git a/gallery_dl/extractor/gelbooru.py b/gallery_dl/extractor/gelbooru.py index a95ed82e..87244904 100644 --- a/gallery_dl/extractor/gelbooru.py +++ b/gallery_dl/extractor/gelbooru.py @@ -22,8 +22,8 @@ info = { class GelbooruExtractor(XMLBooruExtractor): - def __init__(self, match, config): - XMLBooruExtractor.__init__(self, match, config, info) + def __init__(self, match): + XMLBooruExtractor.__init__(self, match, info) self.api_url = "http://gelbooru.com/" self.params = {"page":"dapi", "s":"post", "q":"index", "tags":self.tags} diff --git a/gallery_dl/extractor/imagebam.py b/gallery_dl/extractor/imagebam.py index c89721f2..809eaa1a 100644 --- a/gallery_dl/extractor/imagebam.py +++ b/gallery_dl/extractor/imagebam.py @@ -25,8 +25,8 @@ class ImagebamExtractor(AsynchronousExtractor): url_base = "http://www.imagebam.com" - def __init__(self, match, config): - AsynchronousExtractor.__init__(self, config) + def __init__(self, match): + AsynchronousExtractor.__init__(self) self.match = match self.num = 0 self.metadata = {} diff --git a/gallery_dl/extractor/imgbox.py b/gallery_dl/extractor/imgbox.py index 3de51f27..f466c96a 100644 --- a/gallery_dl/extractor/imgbox.py +++ b/gallery_dl/extractor/imgbox.py @@ -26,8 +26,8 @@ class ImgboxExtractor(AsynchronousExtractor): url_base = "http://imgbox.com" - def __init__(self, match, config): - AsynchronousExtractor.__init__(self, config) + def __init__(self, match): + AsynchronousExtractor.__init__(self) self.key = match.group(1) self.metadata = {} diff --git a/gallery_dl/extractor/imgchili.py b/gallery_dl/extractor/imgchili.py index 9e591e57..8d164764 100644 --- a/gallery_dl/extractor/imgchili.py +++ b/gallery_dl/extractor/imgchili.py @@ -24,8 +24,8 @@ info = { class ImgchiliExtractor(SequentialExtractor): - def __init__(self, match, config): - SequentialExtractor.__init__(self, config) + def __init__(self, match): + SequentialExtractor.__init__(self) self.match = match self.num = 0 diff --git a/gallery_dl/extractor/mangareader.py b/gallery_dl/extractor/mangareader.py index 60ed473a..57fd3efc 100644 --- a/gallery_dl/extractor/mangareader.py +++ b/gallery_dl/extractor/mangareader.py @@ -28,8 +28,8 @@ class MangaReaderExtractor(AsynchronousExtractor): url_base = "http://www.mangareader.net" - def __init__(self, match, config): - AsynchronousExtractor.__init__(self, config) + def __init__(self, match): + AsynchronousExtractor.__init__(self) self.part = match.group(1) def items(self): diff --git a/gallery_dl/extractor/nijie.py b/gallery_dl/extractor/nijie.py index afeefd60..7c309fbf 100644 --- a/gallery_dl/extractor/nijie.py +++ b/gallery_dl/extractor/nijie.py @@ -9,7 +9,7 @@ """Extract images from https://nijie.info/""" from .common import AsynchronousExtractor, Message -from ..text import filename_from_url +from .. import config, text import re info = { @@ -26,8 +26,8 @@ class NijieExtractor(AsynchronousExtractor): popup_url = "https://nijie.info/view_popup.php?id=" - def __init__(self, match, config): - AsynchronousExtractor.__init__(self, config) + def __init__(self, match): + AsynchronousExtractor.__init__(self) self.artist_id = match.group(1) self.artist_url = ( "https://nijie.info/members_illust.php?id=" @@ -36,7 +36,9 @@ class NijieExtractor(AsynchronousExtractor): self.session.headers["Referer"] = self.artist_url self.session.cookies["R18"] = "1" self.session.cookies["nijie_referer"] = "nijie.info" - self.session.cookies.update(config["nijie-cookies"]) + self.session.cookies.update( + config.get(("extractor", info["category"], "cookies")) + ) def items(self): data = self.get_job_metadata() @@ -56,19 +58,19 @@ class NijieExtractor(AsynchronousExtractor): def get_image_ids(self): """Collect all image-ids for a specific artist""" - text = self.request(self.artist_url).text + page = self.request(self.artist_url).text regex = r' Date: Mon, 5 Oct 2015 15:55:11 +0200 Subject: [PATCH 6/6] change example-config to json --- config | 18 ------------------ config.json | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 18 deletions(-) delete mode 100644 config create mode 100644 config.json diff --git a/config b/config deleted file mode 100644 index dec8b374..00000000 --- a/config +++ /dev/null @@ -1,18 +0,0 @@ -[pixiv] -username = XXXXX -password = XXXXX - -[exhentai-cookies] -ipb_member_id = XXXXX -ipb_pass_hash = XXXXX - -[nijie-cookies] -NIJIEIJIEID = XXXXX -nijie_email_hash = XXXXX -nijie_login_hash = XXXXX - -[danbooru] -regex0 = d(?:anbooru)?[.:-_](\w.+) - -[gelbooru] -regex0 = g(?:elbooru)?[.:-_](\w.+) diff --git a/config.json b/config.json new file mode 100644 index 00000000..deba0cef --- /dev/null +++ b/config.json @@ -0,0 +1,39 @@ +{ + "base-directory": "/tmp/", + "extractor": + { + "pixiv": + { + "directory": ["{category}", "{artist-id}"], + "username": "XXX", + "password": "XXX" + }, + "nijie": + { + "cookies": + { + "NIJIEIJIEID": "XXX", + "nijie_email_hash": "XXX", + "nijie_login_hash": "XXX" + } + }, + "4chan": + { + "directory": ["{category}", "{board}", "{thread} - {title}"] + }, + "danbooru": + { + "pattern": ["d(?:anbooru)?[.:-_](\\w.+)"], + "filename": "{category}_{id:>07}_{md5}.{extension}" + }, + "gelbooru": + { + "pattern": ["g(?:elbooru)?[.:-_](\\w.+)"], + "filename": "{category}_{id:>07}_{md5}.{extension}" + }, + "e621": + { + "pattern": ["e(?:621)?[.:-_](\\w.+)"] + } + } +}