Fs uniquifier

admin/model.py

@@ -29,5 +29,6 @@ class User(Base, UserMixin):
     last_login_ip = Column(String(100))
     current_login_ip = Column(String(100))
     active = Column(Boolean())
+    fs_uniquifier = Column(String(255), unique=True, nullable=False)
     confirmed_at = Column(DateTime())
     roles = relationship('Role', secondary='roles_users', backref=backref('users', lazy='dynamic'))

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

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']):