diff options
| author | asciimoo <asciimoo@gmail.com> | 2013-10-22 23:34:45 +0200 |
|---|---|---|
| committer | asciimoo <asciimoo@gmail.com> | 2013-10-22 23:34:45 +0200 |
| commit | 3a6d3e33778fb25dc64002a21681208d9fc509da (patch) | |
| tree | 8e5074301b662aa3b7f1d883082c6e8bfd90c965 /searx/engines | |
| parent | 31471ed93647cbd38e83504c69aa298a40202465 (diff) | |
| download | searxng-3a6d3e33778fb25dc64002a21681208d9fc509da.tar.gz searxng-3a6d3e33778fb25dc64002a21681208d9fc509da.zip | |
[enh][mod] using image template rendering
Diffstat (limited to 'searx/engines')
| -rw-r--r-- | searx/engines/deviantart.py | 5 | ||||
| -rwxr-xr-x | searx/engines/flickr.py | 6 | ||||
| -rwxr-xr-x | searx/engines/google_images.py | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/searx/engines/deviantart.py b/searx/engines/deviantart.py index d598507ac..95d96968d 100644 --- a/searx/engines/deviantart.py +++ b/searx/engines/deviantart.py @@ -24,6 +24,7 @@ def response(resp): url = urljoin(base_url, link.attrib.get('href')) title_links = result.xpath('.//span[@class="details"]//a[contains(@class, "t")]') title = ''.join(title_links[0].xpath('.//text()')) - content = html.tostring(link)+'<br />'+link.attrib.get('title', '') - results.append({'url': url, 'title': title, 'content': content}) + img_src = link.xpath('.//img')[0].attrib['src'] + print img_src + results.append({'url': url, 'title': title, 'img_src': img_src, 'template': 'images.html'}) return results diff --git a/searx/engines/flickr.py b/searx/engines/flickr.py index 60e2b6f3b..079c1e11c 100755 --- a/searx/engines/flickr.py +++ b/searx/engines/flickr.py @@ -23,6 +23,8 @@ def response(resp): url = urljoin(base_url, result.attrib.get('href')) img = result.xpath('.//img')[0] title = img.attrib.get('alt', '') - content = '<img src="%s" alt="%s" />' % (img.attrib.get('data-defer-src', ''), title) - results.append({'url': url, 'title': title, 'content': content}) + img_src = img.attrib.get('data-defer-src') + if not img_src: + continue + results.append({'url': url, 'title': title, 'img_src': img_src, 'template': 'images.html'}) return results diff --git a/searx/engines/google_images.py b/searx/engines/google_images.py index bb7209ca6..2db4fb0e2 100755 --- a/searx/engines/google_images.py +++ b/searx/engines/google_images.py @@ -23,8 +23,5 @@ def response(resp): for result in search_res['responseData']['results']: url = result['originalContextUrl'] title = result['title'] - content = '<a href="%s"><img src="%s" title="%s" style="max-width: 500px; "/></a>' % (result['url'], result['url'], title) - if result['content']: - content += '<br />'+result['content'] - results.append({'url': url, 'title': title, 'content': content}) + results.append({'url': url, 'title': title, 'content': '', 'img_src': result['url'], 'template': 'images.html'}) return results |