kopia lustrzana https://github.com/bellingcat/auto-archiver
Throw an error for invalid __manifest__ syntax + fix: allow default values of False/None
rodzic
73a2e2d752
commit
ca1ed418aa
|
@ -186,7 +186,7 @@ class LazyBaseModule:
|
||||||
try:
|
try:
|
||||||
manifest.update(ast.literal_eval(f.read()))
|
manifest.update(ast.literal_eval(f.read()))
|
||||||
except (ValueError, TypeError, SyntaxError, MemoryError, RecursionError) as e:
|
except (ValueError, TypeError, SyntaxError, MemoryError, RecursionError) as e:
|
||||||
logger.error(f"Error loading manifest from file {self.path}/{MANIFEST_FILE}: {e}")
|
raise ValueError(f"Error loading manifest from file {self.path}/{MANIFEST_FILE}: {e}")
|
||||||
|
|
||||||
self._manifest = manifest
|
self._manifest = manifest
|
||||||
self._entry_point = manifest['entry_point']
|
self._entry_point = manifest['entry_point']
|
||||||
|
@ -256,7 +256,7 @@ class LazyBaseModule:
|
||||||
instance.module_factory = self.module_factory
|
instance.module_factory = self.module_factory
|
||||||
|
|
||||||
# merge the default config with the user config
|
# merge the default config with the user config
|
||||||
default_config = dict((k, v['default']) for k, v in self.configs.items() if v.get('default'))
|
default_config = dict((k, v['default']) for k, v in self.configs.items() if 'default' in v)
|
||||||
|
|
||||||
config[self.name] = default_config | config.get(self.name, {})
|
config[self.name] = default_config | config.get(self.name, {})
|
||||||
instance.config_setup(config)
|
instance.config_setup(config)
|
||||||
|
|
Ładowanie…
Reference in New Issue