git.iko.soy/searx
on master help sign in
[enh] plugins: client side dependency support
commitdd84814b68369e36d6be20bae707848a051a025a authorAdam Tauber <asciimoo@gmail.com> dateSun 12 Apr 2015, 19:24 (12 years ago) parentf59daa4
3 files changed+26−4
compare with master
unifiedsplit
searx/plugins/__init__.py+6 searx/templates/oscar/base.html+10−4 searx/webapp.py+10
searx/plugins/__init__.py+6
@@ -8,6 +8,9 @@ required_attrs = (('name', str),
88 ('description', str),
99 ('default_on', bool))
1010
11+optional_attrs = (('js_dependencies', tuple),
12+ ('css_dependencies', tuple))
13+
1114
1215class Plugin():
1316 default_on = False
@@ -30,6 +33,9 @@ class PluginStore():
3033 if not hasattr(plugin, plugin_attr) or not isinstance(getattr(plugin, plugin_attr), plugin_attr_type):
3134 logger.critical('missing attribute "{0}", cannot load plugin: {1}'.format(plugin_attr, plugin))
3235 exit(3)
36+ for plugin_attr, plugin_attr_type in optional_attrs:
37+ if not hasattr(plugin, plugin_attr) or not isinstance(getattr(plugin, plugin_attr), plugin_attr_type):
38+ setattr(plugin, plugin_attr, plugin_attr_type())
3339 plugin.id = plugin.name.replace(' ', '_')
3440 self.plugins.append(plugin)
3541
searx/templates/oscar/base.html+10−4
@@ -9,17 +9,20 @@
99 <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
1010 {% block meta %}{% endblock %}
1111 <title>{% block title %}{% endblock %}searx</title>
12−
12+
1313 <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
14− <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />
14+ <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />
1515 <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
16+ {% for css in styles %}
17+ <link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" />
18+ {% endfor %}
1619
1720 <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
1821 <!--[if lt IE 9]>
1922 <script src="{{ url_for('static', filename='js/html5shiv.min.js') }}"></script>
2023 <script src="{{ url_for('static', filename='js/respond.min.js') }}"></script>
2124 <![endif]-->
22−
25+
2326 <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
2427
2528 {% block styles %}
@@ -28,7 +31,7 @@
2831 {% endblock %}
2932
3033 <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
31−
34+
3235 <script type="text/javascript">
3336 searx = {};
3437 searx.method = "{{ method or 'POST' }}";
@@ -79,5 +82,8 @@
7982 {% if autocomplete %}<script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %}
8083 <script src="{{ url_for('static', filename='js/require-2.1.15.min.js') }}"></script>
8184 <script src="{{ url_for('static', filename='js/searx.min.js') }}"></script>
85+ {% for script in scripts %}
86+ <script src="{{ url_for('static', filename=script) }}"></script>
87+ {% endfor %}
8288</body>
8389</html>
searx/webapp.py+10
@@ -301,6 +301,16 @@ def render(template_name, override_theme=None, **kwargs):
301301
302302 kwargs['cookies'] = request.cookies
303303
304+ kwargs['scripts'] = set()
305+ for plugin in request.user_plugins:
306+ for script in plugin.js_dependencies:
307+ kwargs['scripts'].add(script)
308+
309+ kwargs['styles'] = set()
310+ for plugin in request.user_plugins:
311+ for css in plugin.css_dependencies:
312+ kwargs['styles'].add(css)
313+
304314 return render_template(
305315 '{}/{}'.format(kwargs['theme'], template_name), **kwargs)
306316