[ehn] add favicons for vimeo, soundcloud, twitter and youtube

8 files changed, 20 insertions, 6 deletions

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
+
diff --git a/searx/static/img/icon_soundcloud.png b/searx/static/img/icon_soundcloud.png
new file mode 100644
index 000000000..4130bea1b
--- /dev/null
+++ b/searx/static/img/icon_soundcloud.png
diff --git a/searx/static/img/icon_twitter.png b/searx/static/img/icon_twitter.png
new file mode 100644
index 000000000..b4a71699a
--- /dev/null
+++ b/searx/static/img/icon_twitter.png
diff --git a/searx/static/img/icon_vimeo.png b/searx/static/img/icon_vimeo.png
new file mode 100644
index 000000000..4fe4336da
--- /dev/null
+++ b/searx/static/img/icon_vimeo.png
diff --git a/searx/static/img/icon_youtube.png b/searx/static/img/icon_youtube.png
new file mode 100644
index 000000000..977887dbb
--- /dev/null
+++ b/searx/static/img/icon_youtube.png
diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html
index 3f2d0f360..14f527361 100644
--- a/searx/templates/result_templates/default.html
+++ b/searx/templates/result_templates/default.html
@@ -2,7 +2,7 @@
 
   {% if result['favicon'] %}
   <div style="float:left; margin:2px;">
-    <img width="24" height="24" src="static/img/icon_{{result['favicon']}}.png" alt="{{result['favicon']}}.png" title="{{result['favicon']}}.png" />
+    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.png" alt="{{result['favicon']}}.png" title="{{result['favicon']}}.png" />
   </div>
   {% endif %}
 
diff --git a/searx/templates/result_templates/videos.html b/searx/templates/result_templates/videos.html
index 97c966e43..524c99116 100644
--- a/searx/templates/result_templates/videos.html
+++ b/searx/templates/result_templates/videos.html
@@ -1,4 +1,12 @@
 <div class="result">
+  
+  {% if result['favicon'] %}
+  <div style="float:left; margin:2px;">
+    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.png" alt="{{result['favicon']}}.png" title="{{result['favicon']}}.png" />
+  </div>
+  {% endif %}
+
+
     <p>
       <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
       <a href="{{ result.url }}"><img width="300" height="170"  src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
diff --git a/searx/webapp.py b/searx/webapp.py
index 5fc981a89..b26e868f5 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -141,11 +141,9 @@ def index():
             result['pretty_url'] = result['url']
 
         for engine in result['engines']:
-            if engine in ['wikipedia']:
-                result['favicon'] = engine 
-                featured_results.append(result)
-                results.remove(result)
-            elif engine in ['ddg definitions']:
+            if engine in ['wikipedia', 'youtube', 'vimeo', 'soundcloud', 'twitter']:
+                result['favicon'] = engine
+            if engine in ['wikipedia', 'ddg definitions']:
                 featured_results.append(result)
                 results.remove(result)