git.iko.soy/searx
on master help sign in
Merge pull request #2247 from dalf/fix-opensearch
e30dc2fAlexandre Flament
searx/templates/__common__/opensearch.xml+4
compare with master
unifiedsplit
@@ -15,4 +15,8 @@
15 {% if autocomplete %}
15 {% if autocomplete %}
16 <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/>
16 <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/>
17 {% endif %}
17 {% endif %}
18+
19+ <Url type="application/opensearchdescription+xml"
20+ rel="self"
21+ template="{{ opensearch_url }}" />
18</OpenSearchDescription>
22</OpenSearchDescription>
searx/templates/__common__/opensearch_response_rss.xml+1−1
@@ -9,7 +9,7 @@
9 <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
9 <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
10 <opensearch:startIndex>1</opensearch:startIndex>
10 <opensearch:startIndex>1</opensearch:startIndex>
11 <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
11 <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
12− <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ base_url }}opensearch.xml"/>
12+ <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ opensearch_url }}"/>
13 <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
13 <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
14 {% if error_message %}
14 {% if error_message %}
15 <item>
15 <item>
searx/templates/courgette/base.html+1−1
@@ -22,7 +22,7 @@
22 {% endblock %}
22 {% endblock %}
23 {% block meta %}{% endblock %}
23 {% block meta %}{% endblock %}
24 {% block head %}
24 {% block head %}
25− <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
25+ <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
26 {% endblock %}
26 {% endblock %}
27 <script type="text/javascript">
27 <script type="text/javascript">
28 searx = {};
28 searx = {};
searx/templates/legacy/base.html+1−1
@@ -17,7 +17,7 @@
17 {% endblock %}
17 {% endblock %}
18 {% block meta %}{% endblock %}
18 {% block meta %}{% endblock %}
19 {% block head %}
19 {% block head %}
20− <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
20+ <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
21 {% endblock %}
21 {% endblock %}
22 </head>
22 </head>
23 <body class="{{ endpoint }}_endpoint" >
23 <body class="{{ endpoint }}_endpoint" >
searx/templates/oscar/base.html+1−1
@@ -37,7 +37,7 @@
37 {% block head %}
37 {% block head %}
38 {% endblock %}
38 {% endblock %}
39
39
40− <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
40+ <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
41 <noscript>
41 <noscript>
42 <style type="text/css">
42 <style type="text/css">
43 .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;}
43 .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;}
searx/templates/simple/base.html+1−1
@@ -29,7 +29,7 @@
29 data-no-item-found="{{ _('No item found') }}"></script>
29 data-no-item-found="{{ _('No item found') }}"></script>
30 <!--<![endif]-->
30 <!--<![endif]-->
31 {% block head %}
31 {% block head %}
32− <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
32+ <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
33 {% endblock %}
33 {% endblock %}
34 <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
34 <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
35</head>
35</head>
searx/webapp.py+3
@@ -386,6 +386,9 @@ def render(template_name, override_theme=None, **kwargs):
386
386
387 kwargs['proxify'] = proxify if settings.get('result_proxy', {}).get('url') else None
387 kwargs['proxify'] = proxify if settings.get('result_proxy', {}).get('url') else None
388
388
389+ kwargs['opensearch_url'] = url_for('opensearch') + '?' \
390+ + urlencode({'method': kwargs['method'], 'autocomplete': kwargs['autocomplete']})
391+
389 kwargs['get_result_template'] = get_result_template
392 kwargs['get_result_template'] = get_result_template
390
393
391 kwargs['theme'] = get_current_theme_name(override=override_theme)
394 kwargs['theme'] = get_current_theme_name(override=override_theme)