From 5cb9d9e56a611f500e3fe1b850218abe6f272bf5 Mon Sep 17 00:00:00 2001
From: Venca24 <Vaclav.Zouzalik@seznam.cz>
Date: Fri, 3 Apr 2020 17:31:59 +0200
Subject: [PATCH 1/7] [add] rubygems engine
---
searx/settings.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/searx/settings.yml b/searx/settings.yml
index 078d95b72..93cb3ee5f 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -763,6 +763,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
From 536eb2b8dd623172c13ac17797582c8949956d7b Mon Sep 17 00:00:00 2001
From: Splinter Suidman <splinter@mannenopdemaan.nl>
Date: Sun, 5 Apr 2020 19:27:44 +0200
Subject: [PATCH 2/7] Add Wikimedia projects.
A list of the added projects:
- Wikibooks
- Wikinews
- Wikiquote
- Wikisource
- Wiktionary
- Wikiversity
- Wikivoyage
---
AUTHORS.rst | 1 +
searx/settings.yml | 70 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+)
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 078d95b72..042315bee 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -686,6 +686,76 @@ 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
+ query : "srsearch={query}"
+
+ - name : wikinews
+ engine : mediawiki
+ shortcut : wn
+ categories : general
+ base_url : "https://{language}.wikinews.org/"
+ number_of_results : 5
+ search_type : text
+ disabled : True
+ query : "srsearch={query}"
+
+ - name : wikiquote
+ engine : mediawiki
+ shortcut : wq
+ categories : general
+ base_url : "https://{language}.wikiquote.org/"
+ number_of_results : 5
+ search_type : text
+ disabled : True
+ query : "srsearch={query}"
+
+ - name : wikisource
+ engine : mediawiki
+ shortcut : ws
+ categories : general
+ base_url : "https://{language}.wikisource.org/"
+ number_of_results : 5
+ search_type : text
+ disabled : True
+ query : "srsearch={query}"
+
+ - name : wikitionary
+ engine : mediawiki
+ shortcut : wt
+ categories : general
+ base_url : "https://{language}.wiktionary.org/"
+ number_of_results : 5
+ search_type : text
+ disabled : True
+ query : "srsearch={query}"
+
+ - name : wikiversity
+ engine : mediawiki
+ shortcut : wvs
+ categories : general
+ base_url : "https://{language}.wikiversity.org/"
+ number_of_results : 5
+ search_type : text
+ disabled : True
+ query : "srsearch={query}"
+
+ - name : wikivoyage
+ engine : mediawiki
+ shortcut : wvy
+ categories : general
+ base_url : "https://{language}.wikivoyage.org/"
+ number_of_results : 5
+ search_type : text
+ disabled : True
+ query : "srsearch={query}"
+
- name : wolframalpha
shortcut : wa
# You can use the engine using the official stable API, but you need an API key
From 2b453cb226a4c0f73a55691810a601fc05143196 Mon Sep 17 00:00:00 2001
From: Splinter Suidman <splinter@mannenopdemaan.nl>
Date: Mon, 6 Apr 2020 12:31:00 +0200
Subject: [PATCH 3/7] fix: Change Wikinews category to news.
---
searx/settings.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/searx/settings.yml b/searx/settings.yml
index 042315bee..42e655b19 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -699,7 +699,7 @@ engines:
- name : wikinews
engine : mediawiki
shortcut : wn
- categories : general
+ categories : news
base_url : "https://{language}.wikinews.org/"
number_of_results : 5
search_type : text
From c37544e6be155bb5ad167a79f852a5dd7ede5df6 Mon Sep 17 00:00:00 2001
From: Splinter Suidman <splinter@mannenopdemaan.nl>
Date: Mon, 6 Apr 2020 12:31:32 +0200
Subject: [PATCH 4/7] fix: Spelling of Wiktionary.
---
searx/settings.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/searx/settings.yml b/searx/settings.yml
index 42e655b19..3ac3f87d3 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -726,7 +726,7 @@ engines:
disabled : True
query : "srsearch={query}"
- - name : wikitionary
+ - name : wiktionary
engine : mediawiki
shortcut : wt
categories : general
From 87fba9c12dfa95b6bb7048d1c0e7536df33cd894 Mon Sep 17 00:00:00 2001
From: Splinter Suidman <splinter@mannenopdemaan.nl>
Date: Mon, 6 Apr 2020 15:59:00 +0200
Subject: [PATCH 5/7] fix: Remove unnecessary query parameter for Wikimedia
projects.
---
searx/settings.yml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/searx/settings.yml b/searx/settings.yml
index 3ac3f87d3..8e817907a 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -694,7 +694,6 @@ engines:
number_of_results : 5
search_type : text
disabled : True
- query : "srsearch={query}"
- name : wikinews
engine : mediawiki
@@ -704,7 +703,6 @@ engines:
number_of_results : 5
search_type : text
disabled : True
- query : "srsearch={query}"
- name : wikiquote
engine : mediawiki
@@ -714,7 +712,6 @@ engines:
number_of_results : 5
search_type : text
disabled : True
- query : "srsearch={query}"
- name : wikisource
engine : mediawiki
@@ -724,7 +721,6 @@ engines:
number_of_results : 5
search_type : text
disabled : True
- query : "srsearch={query}"
- name : wiktionary
engine : mediawiki
@@ -734,7 +730,6 @@ engines:
number_of_results : 5
search_type : text
disabled : True
- query : "srsearch={query}"
- name : wikiversity
engine : mediawiki
@@ -744,7 +739,6 @@ engines:
number_of_results : 5
search_type : text
disabled : True
- query : "srsearch={query}"
- name : wikivoyage
engine : mediawiki
@@ -754,7 +748,6 @@ engines:
number_of_results : 5
search_type : text
disabled : True
- query : "srsearch={query}"
- name : wolframalpha
shortcut : wa
From 83fa88cbec949c0916d7d8854865512a5485b3f3 Mon Sep 17 00:00:00 2001
From: Splinter Suidman <splinter@mannenopdemaan.nl>
Date: Tue, 7 Apr 2020 11:05:35 +0200
Subject: [PATCH 6/7] fix: Change Wikiversity and Wikivoyage shortcuts to wv
and wy.
Suggested by @Venca24 <https://github.com/asciimoo/searx/pull/1914#issuecomment-610194209>.
---
searx/settings.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/searx/settings.yml b/searx/settings.yml
index 8e817907a..3050aedf5 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -733,7 +733,7 @@ engines:
- name : wikiversity
engine : mediawiki
- shortcut : wvs
+ shortcut : wv
categories : general
base_url : "https://{language}.wikiversity.org/"
number_of_results : 5
@@ -742,7 +742,7 @@ engines:
- name : wikivoyage
engine : mediawiki
- shortcut : wvy
+ shortcut : wy
categories : general
base_url : "https://{language}.wikivoyage.org/"
number_of_results : 5
From a7862ba3c1557fd39269dad3781a1909a8cff363 Mon Sep 17 00:00:00 2001
From: Dalf <alex@al-f.net>
Date: Wed, 8 Apr 2020 15:34:01 +0200
Subject: [PATCH 7/7] [mod] .travis.yml: add Python 3.7 and Python 3.8
---
.travis.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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: