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

remove 'info' parameter

Browse Source
This commit is contained in:
Mike Fährmann
2015-11-21 03:12:36 +01:00
parent 78234f0572
commit 2d498b19a1
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/__init__.py
View File

@@ -47,7 +47,7 @@ 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, info, klass in _list_patterns(): for pattern, klass in _list_patterns():
match = re.match(pattern, url) match = re.match(pattern, url)
if match: if match:
return klass(match) return klass(match)
@@ -66,19 +66,11 @@ def _list_patterns():
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__)
try: for klass in _get_classes(module):
klass = getattr(module, module.info["extractor"]) for pattern in klass.pattern:
userpatterns = config.get(("extractor", module_name, "pattern"), default=[]) etuple = (pattern, klass)
for pattern in userpatterns + module.info["pattern"]:
etuple = (pattern, module.info, klass)
_cache.append(etuple) _cache.append(etuple)
yield 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): def _get_classes(module):
"""Return a list of all extractor classes in a module""" """Return a list of all extractor classes in a module"""