Merge pull request #634 from not-my-profile/powered-by

Introduce `categories_as_tabs` & group engines in tabs

1 files changed, 43 insertions, 35 deletions

diff --git a/searx/settings.yml b/searx/settings.yml
index f4ecf6d10..f1d6fa1b1 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -82,12 +82,6 @@ ui:
     simple_style: auto
     # Open result links in a new tab by default
     # results_on_new_tab: false
-    # categories_order :
-    #   - general
-    #   - files
-    #   - map
-    #   - it
-    #   - science
 
 # Lock arbitrary settings on the preferences page.  To find the ID of the user
 # setting you want to lock, check the ID of the form on the page "preferences".
@@ -234,6 +228,18 @@ checker:
         result_container:
           - has_infobox
 
+categories_as_tabs:
+  general:
+  images:
+  videos:
+  news:
+  map:
+  music:
+  it:
+  science:
+  files:
+  social media:
+
 engines:
   - name: apk mirror
     engine: apkmirror
@@ -320,7 +326,7 @@ engines:
     url_xpath: //article[@class="repo-summary"]//a[@class="repo-link"]/@href
     title_xpath: //article[@class="repo-summary"]//a[@class="repo-link"]
     content_xpath: //article[@class="repo-summary"]/p
-    categories: it
+    categories: [it, repos]
     timeout: 4.0
     disabled: true
     shortcut: bb
@@ -419,7 +425,7 @@ engines:
   - name: docker hub
     engine: docker_hub
     shortcut: dh
-    categories: it
+    categories: [it, packages]
 
   - name: erowid
     engine: xpath
@@ -430,7 +436,7 @@ engines:
     url_xpath: //dl[@class="results-list"]/dt[@class="result-title"]/a/@href
     title_xpath: //dl[@class="results-list"]/dt[@class="result-title"]/a/text()
     content_xpath: //dl[@class="results-list"]/dd[@class="result-details"]
-    categories: general
+    categories: []
     shortcut: ew
     disabled: true
     about:
@@ -489,7 +495,8 @@ engines:
     content_xpath: //section[contains(@class, "word__defination")]
     first_page_num: 1
     shortcut: et
-    disabled: true
+    categories: [dictionaries]
+    disabled: false
     about:
       website: https://www.etymonline.com/
       wikidata_id: Q1188617
@@ -528,7 +535,7 @@ engines:
   - name: free software directory
     engine: mediawiki
     shortcut: fsd
-    categories: it
+    categories: [it, software wikis]
     base_url: https://directory.fsf.org/
     number_of_results: 5
     # what part of a page matches the query string: title, text, nearmatch
@@ -579,7 +586,7 @@ engines:
     title_query: name_with_namespace
     content_query: description
     page_size: 20
-    categories: it
+    categories: [it, repos]
     shortcut: gl
     timeout: 10.0
     disabled: true
@@ -605,7 +612,7 @@ engines:
     url_query: html_url
     title_query: name
     content_query: description
-    categories: it
+    categories: [it, repos]
     shortcut: cb
     disabled: true
     about:
@@ -671,7 +678,7 @@ engines:
     url_xpath: './/div[@class="RZEgze"]//div[@class="kCSSQe"]//a/@href'
     content_xpath: './/div[@class="RZEgze"]//a[@class="mnKHRc"]'
     thumbnail_xpath: './/div[@class="uzcko"]/div/span[1]//img/@data-src'
-    categories: files
+    categories: [files, apps]
     shortcut: gpa
     disabled: true
     about:
@@ -749,7 +756,7 @@ engines:
     url_xpath: './/div[@class="ans"]//a/@href'
     content_xpath: './/div[@class="from"]'
     page_size: 20
-    categories: it
+    categories: [it, packages]
     shortcut: ho
     about:
       website: https://hoogle.haskell.org/
@@ -844,7 +851,7 @@ engines:
     engine: xpath
     timeout: 4.0
     disabled: true
-    categories: music
+    categories: [music, lyrics]
     paging: true
     search_url: https://search.azlyrics.com/search.php?q={query}&w=lyrics&p={pageno}
     url_xpath: //td[@class="text-left visitedlyr"]/a/@href
@@ -899,7 +906,7 @@ engines:
     title_query: package/name
     content_query: package/description
     page_size: 25
-    categories: it
+    categories: [it, packages]
     disabled: true
     timeout: 5.0
     shortcut: npm
@@ -1008,7 +1015,7 @@ engines:
     url_query: url
     title_query: name
     content_query: description
-    categories: it
+    categories: [it, packages]
     disabled: true
     timeout: 5.0
     shortcut: pack
@@ -1065,7 +1072,7 @@ engines:
     content_xpath: ./p
     suggestion_xpath: /html/body/main/div/div/div/form/div/div[@class="callout-block"]/p/span/a[@class="link"]
     first_page_num: 1
-    categories: it
+    categories: [it, packages]
     about:
       website: https://pypi.org
       wikidata_id: Q2984686
@@ -1077,7 +1084,7 @@ engines:
   - name: qwant
     engine: qwant
     shortcut: qw
-    categories: general
+    categories: [general, web]
     disabled: false
     additional_tests:
       rosebud: *test_rosebud
@@ -1092,14 +1099,14 @@ engines:
   - name: qwant images
     engine: qwant
     shortcut: qwi
-    categories: images
+    categories: [images, web]
     disabled: false
     network: qwant
 
   - name: qwant videos
     engine: qwant
     shortcut: qwv
-    categories: videos
+    categories: [videos, web]
     disabled: false
     network: qwant
 
@@ -1159,19 +1166,19 @@ engines:
     engine: stackexchange
     shortcut: st
     api_site: 'stackoverflow'
-    categories: it
+    categories: [it, q&a]
 
   - name: askubuntu
     engine: stackexchange
     shortcut: ubuntu
     api_site: 'askubuntu'
-    categories: it
+    categories: [it, q&a]
 
   - name: superuser
     engine: stackexchange
     shortcut: su
     api_site: 'superuser'
-    categories: it
+    categories: [it, q&a]
 
   - name: searchcode code
     engine: searchcode_code
@@ -1354,7 +1361,7 @@ engines:
     url_query: URL
     title_query: Title
     content_query: Snippet
-    categories: general
+    categories: [general, web]
     shortcut: wib
     disabled: true
     about:
@@ -1413,11 +1420,11 @@ engines:
   - name: wiktionary
     engine: mediawiki
     shortcut: wt
-    categories: general
+    categories: [dictionaries]
     base_url: "https://{language}.wiktionary.org/"
     number_of_results: 5
     search_type: text
-    disabled: true
+    disabled: false
     about:
       website: https://www.wiktionary.org/
       wikidata_id: Q151
@@ -1467,7 +1474,7 @@ engines:
     engine: translated
     shortcut: tl
     timeout: 5.0
-    disabled: true
+    disabled: false
     # You can use without an API key, but you are limited to 1000 words/day
     # See: https://mymemory.translated.net/doc/usagelimits.php
     # api_key: ''
@@ -1501,6 +1508,7 @@ engines:
     shortcut: mjk
     engine: xpath
     paging: true
+    categories: [general, web]
     search_url: https://www.mojeek.com/search?q={query}&s={pageno}
     results_xpath: /html/body//div[@class="results"]/ul[@class="results-standard"]/li
     url_xpath: ./h2/a/@href
@@ -1520,6 +1528,7 @@ engines:
 
   - name: naver
     shortcut: nvr
+    categories: [general, web]
     engine: xpath
     paging: true
     search_url: https://search.naver.com/search.naver?where=webkr&sm=osp_hty&ie=UTF-8&query={query}&start={pageno}
@@ -1549,7 +1558,7 @@ engines:
     content_xpath: ./span/p
     suggestion_xpath: /html/body/main/div/div[@class="search__suggestions"]/p/a
     first_page_num: 1
-    categories: it
+    categories: [it, packages]
     disabled: true
     about:
       website: https://rubygems.org/
@@ -1593,14 +1602,14 @@ engines:
     engine: wordnik
     shortcut: def
     base_url: https://www.wordnik.com/
-    categories: general
+    categories: [dictionaries]
     timeout: 5.0
-    disabled: true
+    disabled: false
 
   - name: woxikon.de synonyme
     engine: xpath
     shortcut: woxi
-    categories: general
+    categories: [dictionaries]
     timeout: 5.0
     disabled: true
     search_url: https://synonyme.woxikon.de/synonyme/{query}.php
@@ -1619,7 +1628,6 @@ engines:
     engine: sjp
     shortcut: sjp
     base_url: https://sjp.pwn.pl/
-    categories: general
     timeout: 5.0
     disabled: true
 
@@ -1652,7 +1660,7 @@ engines:
     title_xpath: //span[@class="snippet-title"]
     content_xpath: //p[1][@class="snippet-description"]
     suggestion_xpath: //div[@class="text-gray h6"]/a
-    categories: general
+    categories: [general, web]
     about:
       website: https://brave.com/search/
       wikidata_id: Q107355971