Merge branch 'master' of https://github.com/asciimoo/searx into filtron
This commit is contained in:
commit
3f3351639a
3 changed files with 18 additions and 2 deletions
|
@ -76,4 +76,11 @@ LABEL maintainer="searx <https://github.com/asciimoo/searx>" \
|
||||||
org.label-schema.vcs-ref=${LABEL_VCS_REF} \
|
org.label-schema.vcs-ref=${LABEL_VCS_REF} \
|
||||||
org.label-schema.vcs-url=${LABEL_VCS_URL} \
|
org.label-schema.vcs-url=${LABEL_VCS_URL} \
|
||||||
org.label-schema.build-date="${LABEL_DATE}" \
|
org.label-schema.build-date="${LABEL_DATE}" \
|
||||||
org.label-schema.usage="https://github.com/searx/searx-docker"
|
org.label-schema.usage="https://github.com/searx/searx-docker" \
|
||||||
|
org.opencontainers.image.title="searx" \
|
||||||
|
org.opencontainers.image.version="${SEARX_GIT_VERSION}" \
|
||||||
|
org.opencontainers.image.url="${LABEL_VCS_URL}" \
|
||||||
|
org.opencontainers.image.revision=${LABEL_VCS_REF} \
|
||||||
|
org.opencontainers.image.source=${LABEL_VCS_URL} \
|
||||||
|
org.opencontainers.image.created="${LABEL_DATE}" \
|
||||||
|
org.opencontainers.image.documentation="https://github.com/searx/searx-docker"
|
||||||
|
|
|
@ -165,6 +165,14 @@ def startpage(query, lang):
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def swisscows(query, lang):
|
||||||
|
# swisscows autocompleter
|
||||||
|
url = 'https://swisscows.ch/api/suggest?{query}&itemsCount=5'
|
||||||
|
|
||||||
|
resp = loads(get(url.format(query=urlencode({'query': query}))).text)
|
||||||
|
return resp
|
||||||
|
|
||||||
|
|
||||||
def qwant(query, lang):
|
def qwant(query, lang):
|
||||||
# qwant autocompleter (additional parameter : lang=en_en&count=xxx )
|
# qwant autocompleter (additional parameter : lang=en_en&count=xxx )
|
||||||
url = 'https://api.qwant.com/api/suggest?{query}'
|
url = 'https://api.qwant.com/api/suggest?{query}'
|
||||||
|
@ -196,6 +204,7 @@ backends = {'dbpedia': dbpedia,
|
||||||
'duckduckgo': duckduckgo,
|
'duckduckgo': duckduckgo,
|
||||||
'google': google,
|
'google': google,
|
||||||
'startpage': startpage,
|
'startpage': startpage,
|
||||||
|
'swisscows': swisscows,
|
||||||
'qwant': qwant,
|
'qwant': qwant,
|
||||||
'wikipedia': wikipedia
|
'wikipedia': wikipedia
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ general:
|
||||||
|
|
||||||
search:
|
search:
|
||||||
safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
|
safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
|
||||||
autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
|
autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "swisscows", "qwant", "wikipedia" - leave blank to turn it off by default
|
||||||
default_lang : "" # Default search language - leave blank to detect from browser information or use codes from 'languages.py'
|
default_lang : "" # Default search language - leave blank to detect from browser information or use codes from 'languages.py'
|
||||||
ban_time_on_fail : 5 # ban time in seconds after engine errors
|
ban_time_on_fail : 5 # ban time in seconds after engine errors
|
||||||
max_ban_time_on_fail : 120 # max ban time in seconds after engine errors
|
max_ban_time_on_fail : 120 # max ban time in seconds after engine errors
|
||||||
|
|
Loading…
Reference in a new issue