Browse Source

[enh] add more categories

Martin Fischer 3 years ago
parent
commit
b02f762687

+ 1 - 1
searx/engines/apkmirror.py

@@ -24,7 +24,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['files']
+categories = ['files', 'apps']
 paging = True
 paging = True
 time_range_support = False
 time_range_support = False
 
 

+ 1 - 1
searx/engines/archlinux.py

@@ -20,7 +20,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['it']
+categories = ['it', 'software wikis']
 paging = True
 paging = True
 base_url = 'https://wiki.archlinux.org'
 base_url = 'https://wiki.archlinux.org'
 
 

+ 1 - 1
searx/engines/bing.py

@@ -20,7 +20,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['general']
+categories = ['general', 'web']
 paging = True
 paging = True
 time_range_support = False
 time_range_support = False
 safesearch = False
 safesearch = False

+ 1 - 1
searx/engines/bing_images.py

@@ -27,7 +27,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['images']
+categories = ['images', 'web']
 paging = True
 paging = True
 safesearch = True
 safesearch = True
 time_range_support = True
 time_range_support = True

+ 1 - 1
searx/engines/bing_videos.py

@@ -26,7 +26,7 @@ about = {
     "results": 'HTML',
     "results": 'HTML',
 }
 }
 
 
-categories = ['videos']
+categories = ['videos', 'web']
 paging = True
 paging = True
 safesearch = True
 safesearch = True
 time_range_support = True
 time_range_support = True

+ 1 - 1
searx/engines/duckduckgo.py

@@ -27,7 +27,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['general']
+categories = ['general', 'web']
 paging = True
 paging = True
 supported_languages_url = 'https://duckduckgo.com/util/u588.js'
 supported_languages_url = 'https://duckduckgo.com/util/u588.js'
 time_range_support = True
 time_range_support = True

+ 1 - 1
searx/engines/duckduckgo_images.py

@@ -27,7 +27,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['images']
+categories = ['images', 'web']
 paging = True
 paging = True
 safesearch = True
 safesearch = True
 
 

+ 1 - 1
searx/engines/duden.py

@@ -19,7 +19,7 @@ about = {
     "language": 'de',
     "language": 'de',
 }
 }
 
 
-categories = ['general']
+categories = ['general', 'dictionaries']
 paging = True
 paging = True
 
 
 # search-url
 # search-url

+ 1 - 1
searx/engines/etools.py

@@ -17,7 +17,7 @@ about = {
     "results": 'HTML',
     "results": 'HTML',
 }
 }
 
 
-categories = ['general']
+categories = ['general', 'web']
 paging = False
 paging = False
 safesearch = True
 safesearch = True
 
 

+ 1 - 1
searx/engines/fdroid.py

@@ -18,7 +18,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['files']
+categories = ['files', 'apps']
 paging = True
 paging = True
 
 
 # search-url
 # search-url

+ 1 - 1
searx/engines/genius.py

@@ -20,7 +20,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['music']
+categories = ['music', 'lyrics']
 paging = True
 paging = True
 page_size = 5
 page_size = 5
 
 

+ 1 - 1
searx/engines/gentoo.py

@@ -18,7 +18,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['it']
+categories = ['it', 'software wikis']
 paging = True
 paging = True
 base_url = 'https://wiki.gentoo.org'
 base_url = 'https://wiki.gentoo.org'
 
 

+ 1 - 1
searx/engines/gigablast.py

@@ -22,7 +22,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['general']
+categories = ['general', 'web']
 # gigablast's pagination is totally damaged, don't use it
 # gigablast's pagination is totally damaged, don't use it
 paging = False
 paging = False
 safesearch = True
 safesearch = True

+ 1 - 1
searx/engines/github.py

@@ -17,7 +17,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['it']
+categories = ['it', 'repos']
 
 
 # search-url
 # search-url
 search_url = 'https://api.github.com/search/repositories?sort=stars&order=desc&{query}'  # noqa
 search_url = 'https://api.github.com/search/repositories?sort=stars&order=desc&{query}'  # noqa

+ 1 - 1
searx/engines/google.py

@@ -41,7 +41,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['general']
+categories = ['general', 'web']
 paging = True
 paging = True
 time_range_support = True
 time_range_support = True
 safesearch = True
 safesearch = True

+ 1 - 1
searx/engines/google_images.py

@@ -45,7 +45,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['images']
+categories = ['images', 'web']
 paging = False
 paging = False
 use_locale_domain = True
 use_locale_domain = True
 time_range_support = True
 time_range_support = True

+ 1 - 1
searx/engines/google_videos.py

@@ -54,7 +54,7 @@ about = {
 
 
 # engine dependent config
 # engine dependent config
 
 
-categories = ['videos']
+categories = ['videos', 'web']
 paging = False
 paging = False
 language_support = True
 language_support = True
 use_locale_domain = True
 use_locale_domain = True

+ 1 - 0
searx/engines/seznam.py

@@ -25,6 +25,7 @@ about = {
     "language": "cz",
     "language": "cz",
 }
 }
 
 
+categories = ['general', 'web']
 base_url = 'https://search.seznam.cz/'
 base_url = 'https://search.seznam.cz/'
 
 
 
 

+ 1 - 1
searx/engines/sjp.py

@@ -21,7 +21,7 @@ about = {
     "language": 'pl',
     "language": 'pl',
 }
 }
 
 
-categories = ['general']
+categories = ['general', 'dictionaries']
 paging = False
 paging = False
 
 
 URL = 'https://sjp.pwn.pl'
 URL = 'https://sjp.pwn.pl'

+ 1 - 1
searx/engines/startpage.py

@@ -23,7 +23,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['general']
+categories = ['general', 'web']
 # there is a mechanism to block "bot" search
 # there is a mechanism to block "bot" search
 # (probably the parameter qid), require
 # (probably the parameter qid), require
 # storing of qid's between mulitble search-calls
 # storing of qid's between mulitble search-calls

+ 1 - 1
searx/engines/translated.py

@@ -14,7 +14,7 @@ about = {
 }
 }
 
 
 engine_type = 'online_dictionary'
 engine_type = 'online_dictionary'
-categories = ['general']
+categories = ['general', 'dictionaries']
 url = 'https://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
 url = 'https://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
 web_url = 'https://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
 web_url = 'https://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
 weight = 100
 weight = 100

+ 1 - 1
searx/engines/yahoo.py

@@ -31,7 +31,7 @@ about = {
 }
 }
 
 
 # engine dependent config
 # engine dependent config
-categories = ['general']
+categories = ['general', 'web']
 paging = True
 paging = True
 time_range_support = True
 time_range_support = True
 supported_languages_url = 'https://search.yahoo.com/preferences/languages'
 supported_languages_url = 'https://search.yahoo.com/preferences/languages'

+ 26 - 24
searx/settings.yml

@@ -325,7 +325,7 @@ engines:
     url_xpath: //article[@class="repo-summary"]//a[@class="repo-link"]/@href
     url_xpath: //article[@class="repo-summary"]//a[@class="repo-link"]/@href
     title_xpath: //article[@class="repo-summary"]//a[@class="repo-link"]
     title_xpath: //article[@class="repo-summary"]//a[@class="repo-link"]
     content_xpath: //article[@class="repo-summary"]/p
     content_xpath: //article[@class="repo-summary"]/p
-    categories: it
+    categories: [it, repos]
     timeout: 4.0
     timeout: 4.0
     disabled: true
     disabled: true
     shortcut: bb
     shortcut: bb
@@ -424,7 +424,7 @@ engines:
   - name: docker hub
   - name: docker hub
     engine: docker_hub
     engine: docker_hub
     shortcut: dh
     shortcut: dh
-    categories: it
+    categories: [it, packages]
 
 
   - name: erowid
   - name: erowid
     engine: xpath
     engine: xpath
@@ -494,6 +494,7 @@ engines:
     content_xpath: //section[contains(@class, "word__defination")]
     content_xpath: //section[contains(@class, "word__defination")]
     first_page_num: 1
     first_page_num: 1
     shortcut: et
     shortcut: et
+    categories: [general, dictionaries]
     disabled: true
     disabled: true
     about:
     about:
       website: https://www.etymonline.com/
       website: https://www.etymonline.com/
@@ -533,7 +534,7 @@ engines:
   - name: free software directory
   - name: free software directory
     engine: mediawiki
     engine: mediawiki
     shortcut: fsd
     shortcut: fsd
-    categories: it
+    categories: [it, software wikis]
     base_url: https://directory.fsf.org/
     base_url: https://directory.fsf.org/
     number_of_results: 5
     number_of_results: 5
     # what part of a page matches the query string: title, text, nearmatch
     # what part of a page matches the query string: title, text, nearmatch
@@ -584,7 +585,7 @@ engines:
     title_query: name_with_namespace
     title_query: name_with_namespace
     content_query: description
     content_query: description
     page_size: 20
     page_size: 20
-    categories: it
+    categories: [it, repos]
     shortcut: gl
     shortcut: gl
     timeout: 10.0
     timeout: 10.0
     disabled: true
     disabled: true
@@ -610,7 +611,7 @@ engines:
     url_query: html_url
     url_query: html_url
     title_query: name
     title_query: name
     content_query: description
     content_query: description
-    categories: it
+    categories: [it, repos]
     shortcut: cb
     shortcut: cb
     disabled: true
     disabled: true
     about:
     about:
@@ -676,7 +677,7 @@ engines:
     url_xpath: './/div[@class="RZEgze"]//div[@class="kCSSQe"]//a/@href'
     url_xpath: './/div[@class="RZEgze"]//div[@class="kCSSQe"]//a/@href'
     content_xpath: './/div[@class="RZEgze"]//a[@class="mnKHRc"]'
     content_xpath: './/div[@class="RZEgze"]//a[@class="mnKHRc"]'
     thumbnail_xpath: './/div[@class="uzcko"]/div/span[1]//img/@data-src'
     thumbnail_xpath: './/div[@class="uzcko"]/div/span[1]//img/@data-src'
-    categories: files
+    categories: [files, apps]
     shortcut: gpa
     shortcut: gpa
     disabled: true
     disabled: true
     about:
     about:
@@ -754,7 +755,7 @@ engines:
     url_xpath: './/div[@class="ans"]//a/@href'
     url_xpath: './/div[@class="ans"]//a/@href'
     content_xpath: './/div[@class="from"]'
     content_xpath: './/div[@class="from"]'
     page_size: 20
     page_size: 20
-    categories: it
+    categories: [it, packages]
     shortcut: ho
     shortcut: ho
     about:
     about:
       website: https://hoogle.haskell.org/
       website: https://hoogle.haskell.org/
@@ -849,7 +850,7 @@ engines:
     engine: xpath
     engine: xpath
     timeout: 4.0
     timeout: 4.0
     disabled: true
     disabled: true
-    categories: music
+    categories: [music, lyrics]
     paging: true
     paging: true
     search_url: https://search.azlyrics.com/search.php?q={query}&w=lyrics&p={pageno}
     search_url: https://search.azlyrics.com/search.php?q={query}&w=lyrics&p={pageno}
     url_xpath: //td[@class="text-left visitedlyr"]/a/@href
     url_xpath: //td[@class="text-left visitedlyr"]/a/@href
@@ -904,7 +905,7 @@ engines:
     title_query: package/name
     title_query: package/name
     content_query: package/description
     content_query: package/description
     page_size: 25
     page_size: 25
-    categories: it
+    categories: [it, packages]
     disabled: true
     disabled: true
     timeout: 5.0
     timeout: 5.0
     shortcut: npm
     shortcut: npm
@@ -1013,7 +1014,7 @@ engines:
     url_query: url
     url_query: url
     title_query: name
     title_query: name
     content_query: description
     content_query: description
-    categories: it
+    categories: [it, packages]
     disabled: true
     disabled: true
     timeout: 5.0
     timeout: 5.0
     shortcut: pack
     shortcut: pack
@@ -1070,7 +1071,7 @@ engines:
     content_xpath: ./p
     content_xpath: ./p
     suggestion_xpath: /html/body/main/div/div/div/form/div/div[@class="callout-block"]/p/span/a[@class="link"]
     suggestion_xpath: /html/body/main/div/div/div/form/div/div[@class="callout-block"]/p/span/a[@class="link"]
     first_page_num: 1
     first_page_num: 1
-    categories: it
+    categories: [it, packages]
     about:
     about:
       website: https://pypi.org
       website: https://pypi.org
       wikidata_id: Q2984686
       wikidata_id: Q2984686
@@ -1082,7 +1083,7 @@ engines:
   - name: qwant
   - name: qwant
     engine: qwant
     engine: qwant
     shortcut: qw
     shortcut: qw
-    categories: general
+    categories: [general, web]
     disabled: false
     disabled: false
     additional_tests:
     additional_tests:
       rosebud: *test_rosebud
       rosebud: *test_rosebud
@@ -1097,14 +1098,14 @@ engines:
   - name: qwant images
   - name: qwant images
     engine: qwant
     engine: qwant
     shortcut: qwi
     shortcut: qwi
-    categories: images
+    categories: [images, web]
     disabled: false
     disabled: false
     network: qwant
     network: qwant
 
 
   - name: qwant videos
   - name: qwant videos
     engine: qwant
     engine: qwant
     shortcut: qwv
     shortcut: qwv
-    categories: videos
+    categories: [videos, web]
     disabled: false
     disabled: false
     network: qwant
     network: qwant
 
 
@@ -1164,19 +1165,19 @@ engines:
     engine: stackexchange
     engine: stackexchange
     shortcut: st
     shortcut: st
     api_site: 'stackoverflow'
     api_site: 'stackoverflow'
-    categories: it
+    categories: [it, q&a]
 
 
   - name: askubuntu
   - name: askubuntu
     engine: stackexchange
     engine: stackexchange
     shortcut: ubuntu
     shortcut: ubuntu
     api_site: 'askubuntu'
     api_site: 'askubuntu'
-    categories: it
+    categories: [it, q&a]
 
 
   - name: superuser
   - name: superuser
     engine: stackexchange
     engine: stackexchange
     shortcut: su
     shortcut: su
     api_site: 'superuser'
     api_site: 'superuser'
-    categories: it
+    categories: [it, q&a]
 
 
   - name: searchcode code
   - name: searchcode code
     engine: searchcode_code
     engine: searchcode_code
@@ -1359,7 +1360,7 @@ engines:
     url_query: URL
     url_query: URL
     title_query: Title
     title_query: Title
     content_query: Snippet
     content_query: Snippet
-    categories: general
+    categories: [general, web]
     shortcut: wib
     shortcut: wib
     disabled: true
     disabled: true
     about:
     about:
@@ -1418,7 +1419,7 @@ engines:
   - name: wiktionary
   - name: wiktionary
     engine: mediawiki
     engine: mediawiki
     shortcut: wt
     shortcut: wt
-    categories: general
+    categories: [general, dictionaries]
     base_url: "https://{language}.wiktionary.org/"
     base_url: "https://{language}.wiktionary.org/"
     number_of_results: 5
     number_of_results: 5
     search_type: text
     search_type: text
@@ -1506,6 +1507,7 @@ engines:
     shortcut: mjk
     shortcut: mjk
     engine: xpath
     engine: xpath
     paging: true
     paging: true
+    categories: [general, web]
     search_url: https://www.mojeek.com/search?q={query}&s={pageno}
     search_url: https://www.mojeek.com/search?q={query}&s={pageno}
     results_xpath: /html/body//div[@class="results"]/ul[@class="results-standard"]/li
     results_xpath: /html/body//div[@class="results"]/ul[@class="results-standard"]/li
     url_xpath: ./h2/a/@href
     url_xpath: ./h2/a/@href
@@ -1525,6 +1527,7 @@ engines:
 
 
   - name: naver
   - name: naver
     shortcut: nvr
     shortcut: nvr
+    categories: [general, web]
     engine: xpath
     engine: xpath
     paging: true
     paging: true
     search_url: https://search.naver.com/search.naver?where=webkr&sm=osp_hty&ie=UTF-8&query={query}&start={pageno}
     search_url: https://search.naver.com/search.naver?where=webkr&sm=osp_hty&ie=UTF-8&query={query}&start={pageno}
@@ -1554,7 +1557,7 @@ engines:
     content_xpath: ./span/p
     content_xpath: ./span/p
     suggestion_xpath: /html/body/main/div/div[@class="search__suggestions"]/p/a
     suggestion_xpath: /html/body/main/div/div[@class="search__suggestions"]/p/a
     first_page_num: 1
     first_page_num: 1
-    categories: it
+    categories: [it, packages]
     disabled: true
     disabled: true
     about:
     about:
       website: https://rubygems.org/
       website: https://rubygems.org/
@@ -1598,14 +1601,14 @@ engines:
     engine: wordnik
     engine: wordnik
     shortcut: def
     shortcut: def
     base_url: https://www.wordnik.com/
     base_url: https://www.wordnik.com/
-    categories: general
+    categories: [general, dictionaries]
     timeout: 5.0
     timeout: 5.0
     disabled: true
     disabled: true
 
 
   - name: woxikon.de synonyme
   - name: woxikon.de synonyme
     engine: xpath
     engine: xpath
     shortcut: woxi
     shortcut: woxi
-    categories: general
+    categories: [general, dictionaries]
     timeout: 5.0
     timeout: 5.0
     disabled: true
     disabled: true
     search_url: https://synonyme.woxikon.de/synonyme/{query}.php
     search_url: https://synonyme.woxikon.de/synonyme/{query}.php
@@ -1624,7 +1627,6 @@ engines:
     engine: sjp
     engine: sjp
     shortcut: sjp
     shortcut: sjp
     base_url: https://sjp.pwn.pl/
     base_url: https://sjp.pwn.pl/
-    categories: general
     timeout: 5.0
     timeout: 5.0
     disabled: true
     disabled: true
 
 
@@ -1657,7 +1659,7 @@ engines:
     title_xpath: //span[@class="snippet-title"]
     title_xpath: //span[@class="snippet-title"]
     content_xpath: //p[1][@class="snippet-description"]
     content_xpath: //p[1][@class="snippet-description"]
     suggestion_xpath: //div[@class="text-gray h6"]/a
     suggestion_xpath: //div[@class="text-gray h6"]/a
-    categories: general
+    categories: [general, web]
     about:
     about:
       website: https://brave.com/search/
       website: https://brave.com/search/
       wikidata_id: Q107355971
       wikidata_id: Q107355971