diff --git a/searx/engines/mediawiki.py b/searx/engines/mediawiki.py index d4b3fd843..00ad0f106 100644 --- a/searx/engines/mediawiki.py +++ b/searx/engines/mediawiki.py @@ -14,5 +14,7 @@ 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)]] + 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 = ' '.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 = ' '.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 += ''.format(url, result['media$group']['media$thumbnail'][0]['url']) + thumbnail = result['media$group']['media$thumbnail'][0]['url'] + content += ''.format(url, thumbnail) if len(content): content += '
' + 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 diff --git a/searx/static/css/style.css b/searx/static/css/style.css index 6abe6b4bb..83d281806 100644 --- a/searx/static/css/style.css +++ b/searx/static/css/style.css @@ -79,6 +79,7 @@ a { text-decoration: none; color: #1a11be; } a:visited { color: #7b11be; } .result { margin: 19px 0 18px 0; padding: 0; max-width: 55em; clear: both; } +.result:hover { background: #e8e7e6; } .result_title { margin-bottom: 0; } .result h3 { font-size: 1em; word-wrap:break-word; margin: 5px 0 1px 0; padding: 0 } .result .content { font-size: 0.8em; margin: 0; padding: 0; max-width: 54em; word-wrap:break-word; line-height: 1.24; } diff --git a/searx/static/img/icon_github.ico b/searx/static/img/icon_github.ico new file mode 100644 index 000000000..133f0ca35 Binary files /dev/null and b/searx/static/img/icon_github.ico differ diff --git a/searx/static/img/icon_soundcloud.ico b/searx/static/img/icon_soundcloud.ico new file mode 100644 index 000000000..4130bea1b Binary files /dev/null and b/searx/static/img/icon_soundcloud.ico differ diff --git a/searx/static/img/icon_stackoverflow.ico b/searx/static/img/icon_stackoverflow.ico new file mode 100644 index 000000000..b2242bc6c Binary files /dev/null and b/searx/static/img/icon_stackoverflow.ico differ diff --git a/searx/static/img/icon_twitter.ico b/searx/static/img/icon_twitter.ico new file mode 100644 index 000000000..b4a71699a Binary files /dev/null and b/searx/static/img/icon_twitter.ico differ diff --git a/searx/static/img/icon_vimeo.ico b/searx/static/img/icon_vimeo.ico new file mode 100644 index 000000000..4fe4336da Binary files /dev/null and b/searx/static/img/icon_vimeo.ico differ diff --git a/searx/static/img/icon_wikipedia.ico b/searx/static/img/icon_wikipedia.ico new file mode 100644 index 000000000..911fa76f6 Binary files /dev/null and b/searx/static/img/icon_wikipedia.ico differ diff --git a/searx/static/img/icon_youtube.ico b/searx/static/img/icon_youtube.ico new file mode 100644 index 000000000..977887dbb Binary files /dev/null and b/searx/static/img/icon_youtube.ico differ diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html index 48c0775ae..ab6d469b4 100644 --- a/searx/templates/result_templates/default.html +++ b/searx/templates/result_templates/default.html @@ -1,5 +1,14 @@
-

{{ result.title|safe }}

+ + {% if result['favicon'] %} +
+ {{result['favicon']}}.ico +
+ {% endif %} + +
+

{{ result.title|safe }}


{% if result.content %}{{ result.content|safe }}
{% endif %}

{{ result.pretty_url }}

+
diff --git a/searx/templates/result_templates/videos.html b/searx/templates/result_templates/videos.html new file mode 100644 index 000000000..ae6d8f16c --- /dev/null +++ b/searx/templates/result_templates/videos.html @@ -0,0 +1,13 @@ +
+ {% if result['favicon'] %} +
+ {{result['favicon']}}.ico +
+ {% endif %} + +

+

{{ result.title|safe }}

+  {{ result.title }} +

{{ result.url }}

+

+
diff --git a/searx/templates/results.html b/searx/templates/results.html index 4ca36c656..be40900c3 100644 --- a/searx/templates/results.html +++ b/searx/templates/results.html @@ -9,9 +9,12 @@ {% if suggestions %}
Suggestions: {% for suggestion in suggestions %}
{% endfor %}
{% endif %} + +
Number of results: {{ number_of_results }}
+ {% for result in results %} {% if result['template'] %} {% include 'result_templates/'+result['template'] %} diff --git a/searx/webapp.py b/searx/webapp.py index ec02e8f5c..52398801e 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -120,6 +120,7 @@ def index(): results, suggestions = search(query, request, selected_engines) + featured_results = [] for result in results: if request_data.get('format', 'html') == 'html': if 'content' in result: @@ -134,6 +135,10 @@ def index(): else: result['pretty_url'] = result['url'] + for engine in result['engines']: + if engine in ['wikipedia', 'youtube', 'vimeo', 'soundcloud', 'twitter', 'stackoverflow', 'github']: + result['favicon'] = engine + if request_data.get('format') == 'json': return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json') elif request_data.get('format') == 'csv': @@ -162,7 +167,8 @@ def index(): ,results=results ,q=request_data['q'] ,selected_categories=selected_categories - ,number_of_results=len(results) + ,number_of_results=len(results)+len(featured_results) + ,featured_results=featured_results ,suggestions=suggestions )