github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow multiple extractors per module

Browse Source
This commit is contained in:
Mike Fährmann
2015-11-20 19:54:07 +01:00
parent e9547ebdf3
commit 8c3783706d
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gallery_dl/extractor/__init__.py
View File

@@ -47,10 +47,10 @@ modules = [
def find(url): def find(url):
"""Find extractor suitable for handling the given url""" """Find extractor suitable for handling the given url"""
for pattern, module, klass in _list_patterns(): for pattern, info, klass in _list_patterns():
match = re.match(pattern, url) match = re.match(pattern, url)
if match: if match:
return klass(match), module.info return klass(match), info
return None, None return None, None
# -------------------------------------------------------------------- # --------------------------------------------------------------------
@@ -60,15 +60,30 @@ _cache = []
_module_iter = iter(modules) _module_iter = iter(modules)
def _list_patterns(): def _list_patterns():
"""Yield all available (pattern, module, klass) tuples""" """Yield all available (pattern, info, class) tuples"""
for entry in _cache: for entry in _cache:
yield entry yield entry
for module_name in _module_iter: for module_name in _module_iter:
module = importlib.import_module("."+module_name, __package__) module = importlib.import_module("."+module_name, __package__)
klass = getattr(module, module.info["extractor"]) try:
userpatterns = config.get(("extractor", module_name, "pattern"), default=[]) klass = getattr(module, module.info["extractor"])
for pattern in userpatterns + module.info["pattern"]: userpatterns = config.get(("extractor", module_name, "pattern"), default=[])
etuple = (pattern, module, klass) for pattern in userpatterns + module.info["pattern"]:
_cache.append(etuple) etuple = (pattern, module.info, klass)
yield etuple _cache.append(etuple)
yield etuple
except AttributeError:
for klass in _get_classes(module):
for pattern in klass.pattern:
etuple = (pattern, klass.info, klass)
_cache.append(etuple)
yield etuple
def _get_classes(module):
"""Return a list of all extractor classes in a module"""
return [
klass for klass in module.__dict__.values() if (
hasattr(klass, "info") and klass.__module__ == module.__name__
)
]