Merge pull request #2361 from dalf/fix-1x

[fix] 1x engine

searx/engines/www1x.py

@@ -7,12 +7,12 @@
  @using-api   no
  @results     HTML
  @stable      no (HTML can change)
- @parse       url, title, thumbnail, img_src, content
+ @parse       url, title, thumbnail
 """
 
-from lxml import html
+from lxml import html, etree
 from urllib.parse import urlencode, urljoin
-from searx.utils import extract_text
+from searx.utils import extract_text, eval_xpath_list, eval_xpath_getindex
 
 # engine dependent config
 categories = ['images']
@@ -21,6 +21,7 @@ paging = False
 # search-url
 base_url = 'https://1x.com'
 search_url = base_url + '/backend/search.php?{query}'
+gallery_url = 'https://gallery.1x.com/'
 
 
 # do search-request
@@ -33,23 +34,18 @@ def request(query, params):
 # get response from search-request
 def response(resp):
     results = []
-
+    xmldom = etree.fromstring(resp.content)
-    dom = html.fromstring(resp.text)
+    xmlsearchresult = eval_xpath_getindex(xmldom, '//searchresult', 0)
-    for res in dom.xpath('//div[@class="List-item MainListing"]'):
+    dom = html.fragment_fromstring(xmlsearchresult.text, create_parent='div')
-        # processed start and end of link
+    for link in eval_xpath_list(dom, '/div/table/tr/td/div[2]//a'):
-        link = res.xpath('//a')[0]
-
         url = urljoin(base_url, link.attrib.get('href'))
         title = extract_text(link)
-
+        thumbnail_src = urljoin(gallery_url, eval_xpath_getindex(link, './/img', 0).attrib['src'])
-        thumbnail_src = urljoin(base_url, res.xpath('.//img')[0].attrib['src'])
-        # TODO: get image with higher resolution
-        img_src = thumbnail_src
 
         # append result
         results.append({'url': url,
                         'title': title,
-                        'img_src': img_src,
+                        'img_src': thumbnail_src,
                         'content': '',
                         'thumbnail_src': thumbnail_src,
                         'template': 'images.html'})

searx/settings.yml

@@ -289,6 +289,7 @@ engines:
   - name : 1x
     engine : www1x
     shortcut : 1x
+    timeout : 3.0
     disabled : True
 
   - name : fdroid