From 5bcf28de936f53685c2ae5a1cdd113f1a750d7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 25 Oct 2020 03:05:10 +0100 Subject: [PATCH] add a 'extractor.modules' option --- CHANGELOG.md | 2 ++ docs/configuration.rst | 14 ++++++++++++++ gallery_dl/__init__.py | 10 ++++++++-- gallery_dl/version.py | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3820139..e2818090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Unreleased + ## 1.15.2 - 2020-10-24 ### Additions - [pinterest] implement login support ([#1055](https://github.com/mikf/gallery-dl/issues/1055)) diff --git a/docs/configuration.rst b/docs/configuration.rst index 5398779f..38fd173c 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -2225,6 +2225,20 @@ Miscellaneous Options ===================== +extractor.modules +----------------- +Type + ``list`` of ``strings`` +Default + The ``modules`` list in + `extractor/__init__.py <../gallery_dl/extractor/__init__.py#L12>`__ +Example + ``["reddit", "danbooru", "mangadex"]`` +Description + The list of modules to load when searching for a suitable + extractor class. Useful to reduce startup time and memory usage. + + cache.file ---------- Type diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py index e71a5b08..6c2c7138 100644 --- a/gallery_dl/__init__.py +++ b/gallery_dl/__init__.py @@ -9,7 +9,7 @@ from __future__ import unicode_literals, print_function __author__ = "Mike Fährmann" -__copyright__ = "Copyright 2014-2018 Mike Fährmann" +__copyright__ = "Copyright 2014-2020 Mike Fährmann" __license__ = "GPLv2" __maintainer__ = "Mike Fährmann" __email__ = "mike_faehrmann@web.de" @@ -129,6 +129,12 @@ def main(): for opts in args.options: config.set(*opts) + # extractor modules + modules = config.get(("extractor",), "modules") + if modules is not None: + extractor.modules = modules + extractor._module_iter = iter(modules) + # loglevels output.configure_logging(args.loglevel) if args.loglevel >= logging.ERROR: @@ -142,7 +148,7 @@ def main(): head = "" try: out, err = subprocess.Popen( - ("git", "rev-parse", "--short", "HEAD"), + ("git", "rev-parse", "--short", "HEAD"), stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=os.path.dirname(os.path.abspath(__file__)), diff --git a/gallery_dl/version.py b/gallery_dl/version.py index b2e5a58e..eeb44af3 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.15.2" +__version__ = "1.15.3-dev"