diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2020-04-13 13:01:07 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2020-04-13 13:01:07 +0200 |
| commit | f2ca12b54fdec72cdf0ac906d616e5c8b1fd1cb3 (patch) | |
| tree | e858a25ac8144446c37660e817f2afe28c3f8c71 | |
| parent | 30c0a0fb641f2248829a3ccc3fd6abe58a55c77f (diff) | |
| parent | ee856571c98b9d25a081671a4d7dfe551c7ef6c3 (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | AUTHORS.rst | 1 | ||||
| -rw-r--r-- | searx/settings.yml | 77 |
3 files changed, 81 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 76a20b00d..f6fa9c985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,10 @@ jobs: env: PY=2 - python: "3.5" - python: "3.6" + - python: "3.7" + - python: "3.8" - stage: docker - python: "3.6" + python: "3.8" git: depth: false services: diff --git a/AUTHORS.rst b/AUTHORS.rst index 9ab78b050..462b17017 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -123,3 +123,4 @@ generally made searx better: - Vipul @finn0 - @CaffeinatedTech - Robin Schneider @ypid +- @splintah diff --git a/searx/settings.yml b/searx/settings.yml index 667338e12..b51db0ed2 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -686,6 +686,69 @@ engines: engine : vimeo shortcut : vm + - name : wikibooks + engine : mediawiki + shortcut : wb + categories : general + base_url : "https://{language}.wikibooks.org/" + number_of_results : 5 + search_type : text + disabled : True + + - name : wikinews + engine : mediawiki + shortcut : wn + categories : news + base_url : "https://{language}.wikinews.org/" + number_of_results : 5 + search_type : text + disabled : True + + - name : wikiquote + engine : mediawiki + shortcut : wq + categories : general + base_url : "https://{language}.wikiquote.org/" + number_of_results : 5 + search_type : text + disabled : True + + - name : wikisource + engine : mediawiki + shortcut : ws + categories : general + base_url : "https://{language}.wikisource.org/" + number_of_results : 5 + search_type : text + disabled : True + + - name : wiktionary + engine : mediawiki + shortcut : wt + categories : general + base_url : "https://{language}.wiktionary.org/" + number_of_results : 5 + search_type : text + disabled : True + + - name : wikiversity + engine : mediawiki + shortcut : wv + categories : general + base_url : "https://{language}.wikiversity.org/" + number_of_results : 5 + search_type : text + disabled : True + + - name : wikivoyage + engine : mediawiki + shortcut : wy + categories : general + base_url : "https://{language}.wikivoyage.org/" + number_of_results : 5 + search_type : text + disabled : True + - name : wolframalpha shortcut : wa # You can use the engine using the official stable API, but you need an API key @@ -763,6 +826,20 @@ engines: engine : seedpeer categories: files, music, videos + - name : rubygems + shortcut: rbg + engine: xpath + paging : True + search_url : https://rubygems.org/search?page={pageno}&query={query} + results_xpath: /html/body/main/div/a[@class="gems__gem"] + url_xpath : ./@href + title_xpath : ./span/h2 + content_xpath : ./span/p + suggestion_xpath : /html/body/main/div/div[@class="search__suggestions"]/p/a + first_page_num : 1 + categories: it + disabled : True + # - name : yacy # engine : yacy # shortcut : ya |