瀏覽代碼

[enh][mod] using image template rendering

asciimoo 11 年之前
父節點
當前提交
3a6d3e3377
共有 3 個檔案被更改,包括 8 行新增8 行删除
  1. 3
    2
      searx/engines/deviantart.py
  2. 4
    2
      searx/engines/flickr.py
  3. 1
    4
      searx/engines/google_images.py

+ 3
- 2
searx/engines/deviantart.py 查看文件

24
         url = urljoin(base_url, link.attrib.get('href'))
24
         url = urljoin(base_url, link.attrib.get('href'))
25
         title_links = result.xpath('.//span[@class="details"]//a[contains(@class, "t")]')
25
         title_links = result.xpath('.//span[@class="details"]//a[contains(@class, "t")]')
26
         title = ''.join(title_links[0].xpath('.//text()'))
26
         title = ''.join(title_links[0].xpath('.//text()'))
27
-        content = html.tostring(link)+'<br />'+link.attrib.get('title', '')
28
-        results.append({'url': url, 'title': title, 'content': content})
27
+        img_src = link.xpath('.//img')[0].attrib['src']
28
+        print img_src
29
+        results.append({'url': url, 'title': title, 'img_src': img_src, 'template': 'images.html'})
29
     return results
30
     return results

+ 4
- 2
searx/engines/flickr.py 查看文件

23
         url = urljoin(base_url, result.attrib.get('href'))
23
         url = urljoin(base_url, result.attrib.get('href'))
24
         img = result.xpath('.//img')[0]
24
         img = result.xpath('.//img')[0]
25
         title = img.attrib.get('alt', '')
25
         title = img.attrib.get('alt', '')
26
-        content = '<img src="%s" alt="%s" />' % (img.attrib.get('data-defer-src', ''), title)
27
-        results.append({'url': url, 'title': title, 'content': content})
26
+        img_src = img.attrib.get('data-defer-src')
27
+        if not img_src:
28
+            continue
29
+        results.append({'url': url, 'title': title, 'img_src': img_src, 'template': 'images.html'})
28
     return results
30
     return results

+ 1
- 4
searx/engines/google_images.py 查看文件

23
     for result in search_res['responseData']['results']:
23
     for result in search_res['responseData']['results']:
24
         url = result['originalContextUrl']
24
         url = result['originalContextUrl']
25
         title = result['title']
25
         title = result['title']
26
-        content = '<a href="%s"><img src="%s" title="%s" style="max-width: 500px; "/></a>' % (result['url'], result['url'], title)
27
-        if result['content']:
28
-            content += '<br />'+result['content']
29
-        results.append({'url': url, 'title': title, 'content': content})
26
+        results.append({'url': url, 'title': title, 'content': '', 'img_src': result['url'], 'template': 'images.html'})
30
     return results
27
     return results