Merge remote-tracking branch 'upstream/master'

Dockerfile

@@ -41,8 +41,6 @@ RUN apk upgrade --no-cache \
     openssl-dev \
     tar \
     git \
-    protoc \
-    protobuf-dev \
  && apk add --no-cache \
     ca-certificates \
     su-exec \
@@ -55,7 +53,6 @@ RUN apk upgrade --no-cache \
     uwsgi \
     uwsgi-python3 \
     brotli \
-    protobuf \
  && pip3 install --upgrade pip \
  && pip3 install --no-cache -r requirements.txt \
  && apk del build-dependencies \

requirements-dev.txt

@@ -6,12 +6,12 @@ pylint==2.7.2
 splinter==0.14.0
 transifex-client==0.14.2
 selenium==3.141.0
-twine==3.3.0
+twine==3.4.1
 Pallets-Sphinx-Themes==1.2.3
 Sphinx==3.5.2
 sphinx-issues==1.2.0
 sphinx-jinja==1.1.1
 sphinx-tabs==2.1.0
 sphinxcontrib-programoutput==0.16
 sphinx-autobuild==2020.9.1
-linuxdoc==20210110
+linuxdoc==20210324

requirements.txt

@@ -4,7 +4,7 @@ flask-babel==2.0.0
 flask==1.1.2
 idna==2.10
 jinja2==2.11.3
-lxml==4.6.2
+lxml==4.6.3
 pygments==2.8.0
 python-dateutil==2.8.1
 pyyaml==5.4.1

searx/engines/duckduckgo.py

@@ -39,7 +39,8 @@
 url_ping = 'https://duckduckgo.com/t/sl_h'
 time_range_dict = {'day': 'd',
                    'week': 'w',
-                   'month': 'm'}
+                   'month': 'm',
+                   'year': 'y'}
 
 # specific xpath variables
 result_xpath = '//div[@class="result results_links results_links_deep web-result "]'  # noqa

searx/engines/ina.py

@@ -53,9 +53,7 @@ def response(resp):
 
     # we get html in a JSON container...
     response = loads(resp.text)
-    if "content" not in response:
-        return []
-    dom = html.fromstring(response["content"])
+    dom = html.fromstring(response)
 
     # parse results
     for result in dom.xpath(results_xpath):

searx/engines/soundcloud.py

@@ -55,7 +55,7 @@ def get_client_id():
         app_js_urls = [script_tag.get('src') for script_tag in script_tags if script_tag is not None]
 
         # extracts valid app_js urls from soundcloud.com content
-        for app_js_url in app_js_urls:
+        for app_js_url in app_js_urls[::-1]:
             # gets app_js and searches for the clientid
             response = http_get(app_js_url)
             if response.ok:

searx/engines/youtube_noapi.py

@@ -48,7 +48,6 @@ def request(query, params):
         if params['time_range'] in time_range_dict:
             params['url'] += time_range_url.format(time_range=time_range_dict[params['time_range']])
     else:
-        print(params['engine_data']['next_page_token'])
         params['url'] = next_page_url
         params['method'] = 'POST'
         params['data'] = dumps({

searx/settings.yml

@@ -544,9 +544,9 @@ engines:
   - name : google play apps
     engine : xpath
     search_url : https://play.google.com/store/search?q={query}&c=apps
-    results_xpath : '//div[@class="WHE7ib mpg5gc"]'
-    title_xpath : './/div[@class="RZEgze"]//div[@title and not(@title="")]/a'
-    url_xpath : './/div[@class="RZEgze"]//div[@title and not(@title="")]/a/@href'
+    results_xpath : '//div[@class="ImZGtf mpg5gc"]'
+    title_xpath : './/div[@class="RZEgze"]//div[@class="kCSSQe"]//a'
+    url_xpath : './/div[@class="RZEgze"]//div[@class="kCSSQe"]//a/@href'
     content_xpath : './/div[@class="RZEgze"]//a[@class="mnKHRc"]'
     thumbnail_xpath : './/div[@class="uzcko"]/div/span[1]//img/@data-src'
     categories : files
@@ -563,10 +563,10 @@ engines:
   - name : google play movies
     engine : xpath
     search_url : https://play.google.com/store/search?q={query}&c=movies
-    results_xpath : '//div[@class="WHE7ib mpg5gc"]'
-    title_xpath : './/div[@class="RZEgze"]//div[@title and not(@title="")]/a'
-    url_xpath : './/div[@class="RZEgze"]//div[@title and not(@title="")]/a/@href'
-    content_xpath : './/div[@class="RZEgze"]//a[@class="mnKHRc"]'
+    results_xpath : '//div[@class="ImZGtf mpg5gc"]'
+    title_xpath : './/div[@class="RZEgze"]//div[@class="kCSSQe"]//a'
+    url_xpath : './/div[@class="RZEgze"]//div[@class="kCSSQe"]//a/@href'
+    content_xpath : './/div[@class="kCSSQe"]'
     thumbnail_xpath : './/div[@class="uzcko"]/div/span[1]//img/@data-src'
     categories : videos
     shortcut : gpm
@@ -582,7 +582,7 @@ engines:
   - name : geektimes
     engine : xpath
     paging : True
-    search_url : https://geektimes.ru/search/page{pageno}/?q={query}
+    search_url : https://habr.com/en/search/page{pageno}/?q={query}
     url_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]/@href
     title_xpath : //article[contains(@class, "post")]//a[@class="post__title_link"]
     content_xpath : //article[contains(@class, "post")]//div[contains(@class, "post__text")]
@@ -618,13 +618,13 @@ engines:
       results: HTML
 
   - name : hoogle
-    engine : json_engine
+    engine : xpath
     paging : True
-    search_url : https://www.haskell.org/hoogle/?mode=json&hoogle={query}&start={pageno}
-    results_query : results
-    url_query : location
-    title_query : self
-    content_query : docs
+    search_url : https://hoogle.haskell.org/?hoogle={query}&start={pageno}
+    results_xpath : '//div[@class="result"]'
+    title_xpath : './/div[@class="ans"]//a'
+    url_xpath : './/div[@class="ans"]//a/@href'
+    content_xpath : './/div[@class="from"]'
     page_size : 20
     categories : it
     shortcut : ho
@@ -690,7 +690,7 @@ engines:
     content_xpath : .//a[@class="domain"]
     categories : it
     shortcut : lo
-    timeout : 3.0
+    timeout : 5.0
     disabled: True
     about:
       website: https://lobste.rs/
@@ -1257,6 +1257,7 @@ engines:
 #    engine : yacy
 #    shortcut : ya
 #    base_url : 'http://localhost:8090'
+#    enable_http: True # required if you aren't using HTTPS for your local yacy instance
 #    number_of_results : 5
 #    timeout : 3.0
 

searx/static/themes/oscar/css/logicodev-dark.css

@@ -435,14 +435,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
   background-color: white;
   border: #888 1px solid;
   color: #666;
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZ
-cwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGn
-sAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW8
-6/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0
-ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0w
-Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
-7jwaAAAAAElFTkSuQmCC) 96% no-repeat;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAQAAACR313BAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAABFkAAARZAVnbJUkAAAAHdElNRQfgBxgLDwB20OFsAAAAbElEQVQY073OsQ3CMAAEwJMYwJGnsAehpoXJItltBkmcdZBYgIIiQoLglnz3ui+eP+bk5uneteTMZJa6OJuIqvYzSJoqwqBq8gdmTTW86/dghxAUq4xsVYT9laBYXCw93Aajh7GPEF23t4fkBYevGFTANkPRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE2LTA3LTI0VDExOjU1OjU4KzAyOjAwRFqFOQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNi0wNy0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAAElFTkSuQmCC) 96% no-repeat;
 }
 .custom-select-rtl {
   background-position-x: 4%;
@@ -455,11 +448,8 @@ Ny0yNFQxMToxNTowMCswMjowMP7RDgQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb
   height: 1px;
   width: 1px;
   overflow: hidden;
-  clip: rect(1px 1px 1px 1px);
-  /* IE6, IE7 */
   clip: rect(1px, 1px, 1px, 1px);
   white-space: nowrap;
-  /* added line */
 }
 .label-danger,
 .btn-danger {
@@ -898,3 +888,18 @@ p {
 input.cursor-text {
   margin: 10px 0;
 }
+.engine-tooltip {
+  display: none;
+  position: absolute;
+  padding: 0.5rem 1rem;
+  margin: 0rem 0 0 2rem;
+  border: 1px solid #ddd;
+  background: white;
+  font-size: 14px;
+  font-weight: normal;
+  z-index: 1000000;
+}
+th:hover .engine-tooltip,
+.engine-tooltip:hover {
+  display: inline-block;
+}