commit: e623ee593af95313c42c28e3db69a0e99974e692
parent 978b47602474575b2a6b36c874b4bb3df9b56c1f
Author: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Sun, 14 Dec 2014 23:27:27 +0100
Add icons and badge for the themes
Add kickass in engine list
Add content for the result from kickass
Diffstat:
5 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/searx/engines/kickass.py b/searx/engines/kickass.py
@@ -13,6 +13,7 @@ from cgi import escape
from urllib import quote
from lxml import html
from operator import itemgetter
+from dateutil import parser
# engine dependent config
categories = ['videos', 'music', 'files']
@@ -52,7 +53,7 @@ def response(resp):
link = result.xpath('.//a[@class="cellMainLink"]')[0]
href = urljoin(url, link.attrib['href'])
title = ' '.join(link.xpath('.//text()'))
- #content = escape(' '.join(result.xpath(content_xpath)))
+ content = escape(html.tostring(result.xpath('.//span[@class="font11px lightgrey block"]')[0], method="text"))
seed = result.xpath('.//td[contains(@class, "green")]/text()')[0]
leech = result.xpath('.//td[contains(@class, "red")]/text()')[0]
@@ -73,7 +74,7 @@ def response(resp):
# append result
results.append({'url': href,
'title': title,
- 'content': '',
+ 'content': content,
'seed': seed,
'leech': leech,
'magnetlink': magnetlink,
diff --git a/searx/static/courgette/img/icon_kickass.ico b/searx/static/courgette/img/icon_kickass.ico
Binary files differ.
diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icon_kickass.ico
Binary files differ.
diff --git a/searx/static/oscar/img/icons/kickass.png b/searx/static/oscar/img/icons/kickass.png
Binary files differ.
diff --git a/searx/webapp.py b/searx/webapp.py
@@ -70,7 +70,7 @@ babel = Babel(app)
#TODO configurable via settings.yml
favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud',
- 'twitter', 'stackoverflow', 'github', 'deviantart']
+ 'twitter', 'stackoverflow', 'github', 'deviantart', 'kickass']
cookie_max_age = 60 * 60 * 24 * 365 * 23 # 23 years