From cf8f444e8597bf527ef4bfc691b6d45d5704f77f Mon Sep 17 00:00:00 2001
From: pw3t <romain@berthor.fr>
Date: Sun, 12 Jan 2014 18:31:57 +0100
Subject: [ehn] Add a 'featured result feature'm putting on top of the reasults
 ddg definitions and wikipedia (ugly html / css) [ehn] Add a templates for
 videos, so the thumbnails all have the same side

---
 searx/engines/vimeo.py   | 10 +++++++---
 searx/engines/youtube.py | 11 +++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'searx/engines')

diff --git a/searx/engines/vimeo.py b/searx/engines/vimeo.py
index 52c89ffdd..35bc3d50a 100644
--- a/searx/engines/vimeo.py
+++ b/searx/engines/vimeo.py
@@ -35,7 +35,11 @@ def response(resp):
     for result in dom.xpath(results_xpath):
         url = base_url + result.xpath(url_xpath)[0]
         title = p.unescape(extract_text(result.xpath(title_xpath)))
-        content = '<a href="{0}">  <img src="{2}"/> </a>'.format(url, title, extract_text(result.xpath(content_xpath)[0]))
-        results.append({'url': url, 'title': title, 'content': content})
-
+        thumbnail = extract_text(result.xpath(content_xpath)[0])
+        content = '<a href="{0}">  <img src="{2}"/> </a>'.format(url, title, thumbnail)
+        results.append({'url': url
+                        , 'title': title
+                        , 'content': content 
+                        , 'template':'videos.html'
+                        , 'thumbnail': thumbnail})
     return results
diff --git a/searx/engines/youtube.py b/searx/engines/youtube.py
index 1331f480e..cefdb6536 100644
--- a/searx/engines/youtube.py
+++ b/searx/engines/youtube.py
@@ -26,14 +26,21 @@ def response(resp):
             url = url[:-1]
         title = result['title']['$t']
         content = ''
+
+        thumbnail = ''
         if len(result['media$group']['media$thumbnail']):
-            content += '<a href="{0}" title="{0}" ><img src="{1}" /></a>'.format(url, result['media$group']['media$thumbnail'][0]['url'])
+            thumbnail = result['media$group']['media$thumbnail'][0]['url']
+            content += '<a href="{0}" title="{0}" ><img src="{1}" /></a>'.format(url, thumbnail)
         if len(content):
             content += '<br />' + result['content']['$t']
         else:
             content = result['content']['$t']
 
-        results.append({'url': url, 'title': title, 'content': content})
+        results.append({'url': url
+                        , 'title': title
+                        , 'content': content
+                        , 'template':'videos.html'
+                        , 'thumbnail':thumbnail})
 
     return results
 
-- 
cgit v1.2.3


From a8ec7fe6a4ad86a8eea4aa6be441984bc5ef7e5a Mon Sep 17 00:00:00 2001
From: pw3t <romain@berthor.fr>
Date: Wed, 15 Jan 2014 22:25:10 +0100
Subject: [ehn] add favicons for vimeo, soundcloud, twitter and youtube

---
 searx/engines/mediawiki.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'searx/engines')

diff --git a/searx/engines/mediawiki.py b/searx/engines/mediawiki.py
index d4b3fd843..19b4406b5 100644
--- a/searx/engines/mediawiki.py
+++ b/searx/engines/mediawiki.py
@@ -14,5 +14,13 @@ def request(query, params):
 def response(resp):
     search_results = loads(resp.text)
     res = search_results.get('query', {}).get('search', [])
+
     return [{'url': url + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')),
         'title': result['title']} for result in res[:int(number_of_results)]]
+
+    if not len(res):
+        return results
+    for result in res[:int(number_of_results)]:
+        results.append({'url': url + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')), 'title': result['title'], 'favicon':'wikipedia'})
+    return results
+
-- 
cgit v1.2.3


From 380b440a55ba3b8ec1430843226fa6b4b0dfe289 Mon Sep 17 00:00:00 2001
From: pw3t <romain@berthor.fr>
Date: Thu, 16 Jan 2014 21:58:18 +0100
Subject: [fix] replace the png icons by ico's, minor chnage in the html

---
 searx/engines/mediawiki.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'searx/engines')

diff --git a/searx/engines/mediawiki.py b/searx/engines/mediawiki.py
index 19b4406b5..00ad0f106 100644
--- a/searx/engines/mediawiki.py
+++ b/searx/engines/mediawiki.py
@@ -18,9 +18,3 @@ def response(resp):
     return [{'url': url + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')),
         'title': result['title']} for result in res[:int(number_of_results)]]
 
-    if not len(res):
-        return results
-    for result in res[:int(number_of_results)]:
-        results.append({'url': url + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')), 'title': result['title'], 'favicon':'wikipedia'})
-    return results
-
-- 
cgit v1.2.3