diff options
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rwxr-xr-x | manage.sh | 8 | ||||
| -rw-r--r-- | requirements.txt | 8 | ||||
| -rw-r--r-- | searx/answerers/random/answerer.py | 24 | ||||
| -rw-r--r-- | searx/plugins/oa_doi_rewrite.py | 3 | ||||
| -rw-r--r-- | searx/settings.yml | 3 | ||||
| -rw-r--r-- | searx/static/themes/oscar/img/icons/youtube.png | bin | 4137 -> 587 bytes |
7 files changed, 35 insertions, 13 deletions
diff --git a/Dockerfile b/Dockerfile index 273585033..39d56edba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 MAINTAINER searx <https://github.com/asciimoo/searx> LABEL description "A privacy-respecting, hackable metasearch engine." @@ -1,15 +1,17 @@ #!/bin/sh BASE_DIR="$(dirname -- "`readlink -f -- "$0"`")" -export PATH="$BASE_DIR/node_modules/.bin":$PATH + +cd -- "$BASE_DIR" +set -e + +export PATH="$(npm bin)":$PATH # subshell PYTHONPATH="$BASE_DIR" SEARX_DIR="$BASE_DIR/searx" ACTION="$1" -cd -- "$BASE_DIR" -set -e # # Python diff --git a/requirements.txt b/requirements.txt index 77e5b3dd2..fd61b8109 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ certifi==2017.11.5 flask==1.0.2 flask-babel==0.11.2 -lxml==4.2.1 -idna==2.6 +lxml==4.2.3 +idna==2.7 pygments==2.1.3 pyopenssl==18.0.0 python-dateutil==2.7.3 -pyyaml==3.12 -requests[socks]==2.18.4 +pyyaml==3.13 +requests[socks]==2.19.1 diff --git a/searx/answerers/random/answerer.py b/searx/answerers/random/answerer.py index f2b8bf3e5..b6e8422ad 100644 --- a/searx/answerers/random/answerer.py +++ b/searx/answerers/random/answerer.py @@ -1,6 +1,8 @@ +import hashlib import random import string import sys +import uuid from flask_babel import gettext # required answerer attribute @@ -16,9 +18,13 @@ else: random_string_letters = string.ascii_lowercase + string.digits + string.ascii_uppercase +def random_characters(): + return [random.choice(random_string_letters) + for _ in range(random.randint(8, 32))] + + def random_string(): - return u''.join(random.choice(random_string_letters) - for _ in range(random.randint(8, 32))) + return u''.join(random_characters()) def random_float(): @@ -29,9 +35,21 @@ def random_int(): return unicode(random.randint(-random_int_max, random_int_max)) +def random_sha256(): + m = hashlib.sha256() + m.update(b''.join(random_characters())) + return unicode(m.hexdigest()) + + +def random_uuid(): + return unicode(uuid.uuid4()) + + random_types = {b'string': random_string, b'int': random_int, - b'float': random_float} + b'float': random_float, + b'sha256': random_sha256, + b'uuid': random_uuid} # required answerer function diff --git a/searx/plugins/oa_doi_rewrite.py b/searx/plugins/oa_doi_rewrite.py index f558bf695..d4942498f 100644 --- a/searx/plugins/oa_doi_rewrite.py +++ b/searx/plugins/oa_doi_rewrite.py @@ -30,7 +30,8 @@ def get_doi_resolver(args, preference_doi_resolver): doi_resolver = args.get('doi_resolver', preference_doi_resolver)[0] if doi_resolver not in doi_resolvers: doi_resolvers = settings['default_doi_resolver'] - return doi_resolver + doi_resolver_url = doi_resolvers[doi_resolver] + return doi_resolver_url def on_result(request, search, result): diff --git a/searx/settings.yml b/searx/settings.yml index 54b3d6222..1168ad7a4 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -752,7 +752,7 @@ locales: it : Italiano (Italian) ja : 日本語 (Japanese) nl : Nederlands (Dutch) - pl : Polszczyzna (Polish) + pl : Polski (Polish) pt : Português (Portuguese) pt_BR : Português (Portuguese_Brazil) ro : Română (Romanian) @@ -770,5 +770,6 @@ doi_resolvers : oadoi.org : 'https://oadoi.org/' doi.org : 'https://doi.org/' doai.io : 'http://doai.io/' + sci-hub.tw : 'http://sci-hub.tw/' default_doi_resolver : 'oadoi.org' diff --git a/searx/static/themes/oscar/img/icons/youtube.png b/searx/static/themes/oscar/img/icons/youtube.png Binary files differindex eee45df25..4dc2ffbc5 100644 --- a/searx/static/themes/oscar/img/icons/youtube.png +++ b/searx/static/themes/oscar/img/icons/youtube.png |
