made sourceloader use static Configurator methods
This commit is contained in:
parent
f93ff4a309
commit
3278de2b3a
@ -1,10 +1,9 @@
|
|||||||
import inspect
|
import inspect
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import ConfigParser
|
|
||||||
|
|
||||||
from FourmiCrawler.sources.source import Source
|
from FourmiCrawler.sources.source import Source
|
||||||
|
from utils.configurator import Configurator
|
||||||
|
|
||||||
class SourceLoader:
|
class SourceLoader:
|
||||||
sources = []
|
sources = []
|
||||||
@ -20,17 +19,14 @@ class SourceLoader:
|
|||||||
path += "/" + rel_dir
|
path += "/" + rel_dir
|
||||||
known_parser = set()
|
known_parser = set()
|
||||||
|
|
||||||
config = ConfigParser.ConfigParser()
|
config = Configurator.read_sourceconfiguration()
|
||||||
config.read('sources.cfg')
|
|
||||||
|
|
||||||
for py in [f[:-3] for f in os.listdir(path) if f.endswith('.py') and f != '__init__.py']:
|
for py in [f[:-3] for f in os.listdir(path) if f.endswith('.py') and f != '__init__.py']:
|
||||||
mod = __import__('.'.join([rel_dir.replace("../", "").replace("/", "."), py]), fromlist=[py])
|
mod = __import__('.'.join([rel_dir.replace("../", "").replace("/", "."), py]), fromlist=[py])
|
||||||
classes = [getattr(mod, x) for x in dir(mod) if inspect.isclass(getattr(mod, x))]
|
classes = [getattr(mod, x) for x in dir(mod) if inspect.isclass(getattr(mod, x))]
|
||||||
for cls in classes:
|
for cls in classes:
|
||||||
if issubclass(cls, Source) and cls not in known_parser:
|
if issubclass(cls, Source) and cls not in known_parser:
|
||||||
sourcecfg = dict()
|
sourcecfg = Configurator.get_section(config, cls.__name__)
|
||||||
if config.has_section(cls.__name__):
|
|
||||||
sourcecfg = dict(config.items(cls.__name__))
|
|
||||||
self.sources.append(cls(sourcecfg))
|
self.sources.append(cls(sourcecfg))
|
||||||
known_parser.add(cls)
|
known_parser.add(cls)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user