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

Commit a9ad88e0 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch '3896-no-results' into 'master' 

Retry when request fail; Updated default list of search engines

Closes e/backlog#3896

See merge request e/cloud/my-spot!70
parents 1bede368 6848895c

searx/network/network.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,7 @@ def initialize(settings_engines=None, settings_outgoing=None): 
        # from https://github.com/psf/requests/blob/8c211a96cdbe9fe320d63d9e1ae15c5c07e179f8/requests/models.py#L55

        # from https://github.com/psf/requests/blob/8c211a96cdbe9fe320d63d9e1ae15c5c07e179f8/requests/models.py#L55

        'max_redirects': settings_outgoing.get('max_redirects', 30),

        'max_redirects': settings_outgoing.get('max_redirects', 30),

        #

        #

        'retries': settings_outgoing.get('retries', 0),

        'retries': settings_outgoing.get('retries', 3),

        'retry_on_http_error': None,

        'retry_on_http_error': None,

    }

    }

searx/settings.yml

+2 −4
Original line number Original line Diff line number Diff line
@@ -241,7 +241,6 @@ engines: 
  - name : bing

  - name : bing

    engine : bing

    engine : bing

    shortcut : bi

    shortcut : bi

    disabled : True





  - name : bing images

  - name : bing images

    engine : bing_images

    engine : bing_images
@@ -555,7 +554,6 @@ engines: 
  - name : google

  - name : google

    engine : google

    engine : google

    shortcut : go

    shortcut : go

    disabled : True

    use_mobile_ui: false

    use_mobile_ui: false

    # additional_tests:

    # additional_tests:

    #   android: *test_android

    #   android: *test_android
@@ -992,7 +990,6 @@ engines: 
    engine : qwant

    engine : qwant

    shortcut : qw

    shortcut : qw

    categories : general

    categories : general

    disabled : True

    additional_tests:

    additional_tests:

      rosebud: *test_rosebud

      rosebud: *test_rosebud
@@ -1498,13 +1495,13 @@ engines: 
    shortcut: nvr

    shortcut: nvr

    engine: xpath

    engine: xpath

    paging : True

    paging : True

    disabled : True

    search_url : https://search.naver.com/search.naver?where=webkr&sm=osp_hty&ie=UTF-8&query={query}&start={pageno}

    search_url : https://search.naver.com/search.naver?where=webkr&sm=osp_hty&ie=UTF-8&query={query}&start={pageno}

    url_xpath : //a[@class="link_tit"]/@href

    url_xpath : //a[@class="link_tit"]/@href

    title_xpath : //a[@class="link_tit"]

    title_xpath : //a[@class="link_tit"]

    content_xpath : //a[@class="total_dsc"]/div

    content_xpath : //a[@class="total_dsc"]/div

    first_page_num : 1

    first_page_num : 1

    page_size : 10

    page_size : 10

    disabled : True

    about:

    about:

      website: https://www.naver.com/

      website: https://www.naver.com/

      wikidata_id: Q485639

      wikidata_id: Q485639
@@ -1618,6 +1615,7 @@ engines: 
    shortcut: brave

    shortcut: brave

    engine: xpath

    engine: xpath

    paging: false

    paging: false

    disabled: True

    search_url: https://search.brave.com/search?q={query}

    search_url: https://search.brave.com/search?q={query}

    url_xpath: //div[@class="snippet fdb"]/a/@href

    url_xpath: //div[@class="snippet fdb"]/a/@href

    title_xpath: //span[@class="snippet-title"]

    title_xpath: //span[@class="snippet-title"]