NTab仓库
fjmwkj
/
searxng
mirror of https://github.com/searxng/searxng
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

[fix] opensearch.xml URL contains method and autocomplete parameters

When the user add searx as a search engine, the browser loads the /opensearch.xml URL without the cookies.
Without the query parameters, the user preferences are ignored (method and autocomplete).

In addition, opensearch.xml is modified to support automatic updates,
see https://developer.mozilla.org/en-US/docs/Web/OpenSearch
Alexandre Flament 4 years ago
parent
584760cf54
commit
bfdad7bc0f
7 changed files with 12 additions and 5 deletions
Unified View Show Diff Stats
  1. 4 0
      searx/templates/__common__/opensearch.xml
  2. 1 1
      searx/templates/__common__/opensearch_response_rss.xml
  3. 1 1
      searx/templates/courgette/base.html
  4. 1 1
      searx/templates/legacy/base.html
  5. 1 1
      searx/templates/oscar/base.html
  6. 1 1
      searx/templates/simple/base.html
  7. 3 0
      searx/webapp.py

+ 4 - 0
searx/templates/__common__/opensearch.xml
View File 

@@ -15,4 +15,8 @@
 
   {% if autocomplete %}
 
   {% if autocomplete %}
 
     <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/>
 
     <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/>
 
   {% endif %}
 
   {% endif %}
 
+
 
+  <Url type="application/opensearchdescription+xml"
 
+      rel="self"
 
+      template="{{ opensearch_url }}" />
 
 </OpenSearchDescription>
 
 </OpenSearchDescription>

+ 1 - 1
searx/templates/__common__/opensearch_response_rss.xml
View File 

@@ -9,7 +9,7 @@
 
     <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
 
     <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
 
     <opensearch:startIndex>1</opensearch:startIndex>
 
     <opensearch:startIndex>1</opensearch:startIndex>
 
     <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
 
     <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
 
-    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ base_url }}opensearch.xml"/>
 
+    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ opensearch_url }}"/>
 
     <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
 
     <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
 
     {% if error_message %}
 
     {% if error_message %}
 
     <item>
 
     <item>

+ 1 - 1
searx/templates/courgette/base.html
View File 

@@ -22,7 +22,7 @@
 
         {% endblock %}
 
         {% endblock %}
 
         {% block meta %}{% endblock %}
 
         {% block meta %}{% endblock %}
 
         {% block head %}
 
         {% block head %}
 
-        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
 
+        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
 
         {% endblock %}
 
         {% endblock %}
 
         <script type="text/javascript">
 
         <script type="text/javascript">
 
             searx = {};
 
             searx = {};

+ 1 - 1
searx/templates/legacy/base.html
View File 

@@ -17,7 +17,7 @@
 
         {% endblock %}
 
         {% endblock %}
 
         {% block meta %}{% endblock %}
 
         {% block meta %}{% endblock %}
 
         {% block head %}
 
         {% block head %}
 
-        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
 
+        <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
 
         {% endblock %}
 
         {% endblock %}
 
     </head>
 
     </head>
 
     <body class="{{ endpoint }}_endpoint" >
 
     <body class="{{ endpoint }}_endpoint" >

+ 1 - 1
searx/templates/oscar/base.html
View File 

@@ -37,7 +37,7 @@
 
     {% block head %}
 
     {% block head %}
 
     {% endblock %}
 
     {% endblock %}
 
 
 
-    <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
 
+    <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
 
     <noscript>
 
     <noscript>
 
         <style type="text/css">
 
         <style type="text/css">
 
             .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;}
 
             .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;}

+ 1 - 1
searx/templates/simple/base.html
View File 

@@ -29,7 +29,7 @@
 
           data-no-item-found="{{ _('No item found') }}"></script>
 
           data-no-item-found="{{ _('No item found') }}"></script>
 
   <!--<![endif]-->
 
   <!--<![endif]-->
 
   {% block head %}
 
   {% block head %}
 
-  <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
 
+  <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
 
   {% endblock %}
 
   {% endblock %}
 
   <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
 
   <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
 
 </head>
 
 </head>

+ 3 - 0
searx/webapp.py
View File 

@@ -386,6 +386,9 @@ def render(template_name, override_theme=None, **kwargs):
 
 
 
     kwargs['proxify'] = proxify if settings.get('result_proxy', {}).get('url') else None
 
     kwargs['proxify'] = proxify if settings.get('result_proxy', {}).get('url') else None
 
 
 
+    kwargs['opensearch_url'] = url_for('opensearch') + '?' \
 
+        + urlencode({'method': kwargs['method'], 'autocomplete': kwargs['autocomplete']})
 
+
 
     kwargs['get_result_template'] = get_result_template
 
     kwargs['get_result_template'] = get_result_template
 
 
 
     kwargs['theme'] = get_current_theme_name(override=override_theme)
 
     kwargs['theme'] = get_current_theme_name(override=override_theme)

© 2025 NTab仓库
Page: 271ms Template: 110ms 微信 微信二维码 哔哩哔哩 Sina Weibo Javascript Licenses Website