Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 471ec05f authored by Gaël Duval's avatar Gaël Duval 🏄🏼
Browse files

Merge branch 'nicofonk/rebase-from-searx' into 'master' 

rebase from upstream and fix unit tests about /stats endpoint

See merge request e/cloud/my-spot!26
parents c27b161f 1bbf02fe

searx/__init__.py

+4 −0
Original line number Diff line number Diff line
@@ -98,3 +98,7 @@ if 'IMAGE_PROXY' in environ: 
    settings['server']['image_proxy'] = environ['IMAGE_PROXY']

if 'SEARX_REDIS_HOST' in environ:

    settings['redis']['host'] = environ['SEARX_REDIS_HOST']

if 'HTTP_PROXY_URL' in environ:

    settings['proxies']['http'] = environ['HTTP_PROXY_URL']

if 'HTTPS_PROXY_URL' in environ:

    settings['proxies']['https'] = environ['HTTPS_PROXY_URL']

searx/data/engines_languages.json

+18935 −18671

File changed.

Preview size limit exceeded, changes collapsed.

searx/engines/__init__.py

+1 −2
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ def load_engine(engine_data): 
               iso_lang not in getattr(engine, 'supported_languages'):

                language_aliases[iso_lang] = engine_lang



        if language_aliases:

        setattr(engine, 'language_aliases', language_aliases)



    # assign language fetching method if auxiliary method exists

searx/engines/archlinux.py

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ def locale_to_lang_code(locale): 
# wikis for some languages were moved off from the main site, we need to make

# requests to correct URLs to be able to get results in those languages

lang_urls = {

    'en': {

    'all': {

        'base': 'https://wiki.archlinux.org',

        'search': '/index.php?title=Special:Search&offset={offset}&{query}'

    },
@@ -67,7 +67,7 @@ lang_urls = { 
def get_lang_urls(language):

    if language in lang_urls:

        return lang_urls[language]

    return lang_urls['en']

    return lang_urls['all']





# Language names to build search requests for

searx/engines/asksteem.py

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
"""

 Asksteem (general)



 @website     https://asksteem.com/

 @provide-api yes



 @using-api   yes

 @results     JSON (https://github.com/Hoxly/asksteem-docs/wiki)

 @stable      yes

 @parse       url, title, content

"""



from json import loads

from searx.url_utils import urlencode



# engine dependent config

categories = ['general']

paging = True

language_support = False

disabled = True



# search-url

search_url = 'https://api.asksteem.com/search?{params}'

result_url = 'https://steemit.com/@{author}/{title}'





# do search-request

def request(query, params):

    url = search_url.format(params=urlencode({'q': query, 'pg': params['pageno']}))

    params['url'] = url

    return params





# get response from search-request

def response(resp):

    json = loads(resp.text)



    results = []



    for result in json.get('results', []):

        results.append({'url': result_url.format(author=result['author'], title=result['permlink']),

                        'title': result['title'],

                        'content': result['summary']})

    return results