From 733ae601da47098c33cbaa02d64b31a780e54924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 5 Oct 2015 18:10:18 +0200 Subject: [PATCH] enable user-specified patterns --- gallery_dl/extractor/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py index c8e41161..7c7426c4 100644 --- a/gallery_dl/extractor/__init__.py +++ b/gallery_dl/extractor/__init__.py @@ -8,6 +8,7 @@ import re import importlib +from .. import config modules = [ "pixiv", @@ -45,10 +46,12 @@ def _list_patterns(): """Yield all available (pattern, module, klass) tuples""" for entry in _cache: yield entry + for module_name in _module_iter: module = importlib.import_module("."+module_name, __package__) klass = getattr(module, module.info["extractor"]) - for pattern in module.info["pattern"]: + userpatterns = config.get(("extractor", module_name, "pattern"), default=[]) + for pattern in userpatterns + module.info["pattern"]: etuple = (pattern, module, klass) _cache.append(etuple) yield etuple