From a95c6cd76f27ed4eac1b2a20e4cdfdc047210fad Mon Sep 17 00:00:00 2001
From: Fred LE MEUR <frederic.le-meur@ac-versailles.fr>
Date: Tue, 18 Aug 2020 16:39:01 +0200
Subject: [PATCH 1/2] To test with virtualenv

---
 admin/reference_settings.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/admin/reference_settings.yml b/admin/reference_settings.yml
index 9e09baf..202fffb 100644
--- a/admin/reference_settings.yml
+++ b/admin/reference_settings.yml
@@ -188,9 +188,9 @@ engines:
 #    shortcut : fa
 #    api_key : 'apikey' # required!
 
-  - name : 500px
-    engine : www500px
-    shortcut : px
+#  - name : 500px
+#    engine : www500px
+#    shortcut : px
 
   - name : 1x
     engine : www1x
@@ -505,13 +505,13 @@ engines:
     shortcut : se
     categories : science
 
-  - name : spotify
-    engine : spotify
-    shortcut : stf
+#  - name : spotify
+#    engine : spotify
+#    shortcut : stf
 
-  - name : subtitleseeker
-    engine : subtitleseeker
-    shortcut : ss
+#  - name : subtitleseeker
+#    engine : subtitleseeker
+#    shortcut : ss
 # The language is an option. You can put any language written in english
 # Examples : English, French, German, Hungarian, Chinese...
 #    language : English
@@ -530,10 +530,10 @@ engines:
     timeout : 6.0
     disabled : True
 
-  - name : swisscows
-    engine : swisscows
-    shortcut : sw
-    disabled : True
+#  - name : swisscows
+#    engine : swisscows
+#    shortcut : sw
+#    disabled : True
 
   - name : tokyotoshokan
     engine : tokyotoshokan

From a016ca33d5299ca1efa11983b653161ca678465d Mon Sep 17 00:00:00 2001
From: Fred LE MEUR <frederic.le-meur@ac-versailles.fr>
Date: Mon, 25 Jan 2021 16:59:52 +0100
Subject: [PATCH 2/2] Fix read existing searx_generated_settings.yml

Please see:
https://salsa.debian.org/python-team/packages/searx-admin/-/issues/4#note_213101
---
 admin/searx_manager.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/searx_manager.py b/admin/searx_manager.py
index c845374..31aae71 100644
--- a/admin/searx_manager.py
+++ b/admin/searx_manager.py
@@ -74,11 +74,14 @@ def __init__(self, root, uwsgi_extra_args):
                     outfile.write(config)
 
     def _merge_settings(self, new_settings):
-        for k, s in new_settings.items():
+        for k, s in list(new_settings.items()):
             if k == 'engines':
                 continue
-            for kk, c in s.items():
-                self.settings[k][kk] = c
+            try:
+                for kk, c in list(s.items()):
+                    self.settings[k][kk] = c
+            except AttributeError:  # s is not a dictionary
+                self.settings[k] = s
 
         editable_engines = {e['name']: e for e in new_settings['engines']}
         for i, e in enumerate(self.settings['engines']):