ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[mod] plugins: minor change 

required attributes: display a different message
when the attribute has the wrong type
This commit is contained in:
Alexandre Flament 2021-08-14 18:03:31 +02:00
parent 7f18cbbee0
commit 3f3b5d6181
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
searx/plugins/__init__.py
View File

@ -40,7 +40,8 @@ required_attrs = (('name', str),
('default_on', bool)) ('default_on', bool))
optional_attrs = (('js_dependencies', tuple), optional_attrs = (('js_dependencies', tuple),
('css_dependencies', tuple)) ('css_dependencies', tuple),
('preference_section', str))
class Plugin(): class Plugin():
@ -63,9 +64,17 @@ class PluginStore():
plugins = load_external_plugins(plugins) plugins = load_external_plugins(plugins)
for plugin in plugins: for plugin in plugins:
for plugin_attr, plugin_attr_type in required_attrs: for plugin_attr, plugin_attr_type in required_attrs:
if not hasattr(plugin, plugin_attr) or not isinstance(getattr(plugin, plugin_attr), plugin_attr_type): if not hasattr(plugin, plugin_attr):
logger.critical('missing attribute "{0}", cannot load plugin: {1}'.format(plugin_attr, plugin)) logger.critical('missing attribute "{0}", cannot load plugin: {1}'.format(plugin_attr, plugin))
exit(3) exit(3)
attr = getattr(plugin, plugin_attr)
if not isinstance(attr, plugin_attr_type):
type_attr = str(type(attr))
logger.critical(
'attribute "{0}" is of type {2}, must be of type {3}, cannot load plugin: {1}'
.format(plugin_attr, plugin, type_attr, plugin_attr_type)
)
exit(3)
for plugin_attr, plugin_attr_type in optional_attrs: for plugin_attr, plugin_attr_type in optional_attrs:
if not hasattr(plugin, plugin_attr) or not isinstance(getattr(plugin, plugin_attr), plugin_attr_type): if not hasattr(plugin, plugin_attr) or not isinstance(getattr(plugin, plugin_attr), plugin_attr_type):
setattr(plugin, plugin_attr, plugin_attr_type()) setattr(plugin, plugin_attr, plugin_attr_type())