diff --git a/searx/engines/kickass.py b/searx/engines/kickass.py index 640a18a5..bd11a3b6 100644 --- 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 new file mode 100644 index 00000000..4aa2c77a Binary files /dev/null and b/searx/static/courgette/img/icon_kickass.ico differ diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icon_kickass.ico new file mode 100644 index 00000000..4aa2c77a Binary files /dev/null and b/searx/static/default/img/icon_kickass.ico differ diff --git a/searx/static/oscar/img/icons/kickass.png b/searx/static/oscar/img/icons/kickass.png new file mode 100644 index 00000000..59e80910 Binary files /dev/null and b/searx/static/oscar/img/icons/kickass.png differ diff --git a/searx/webapp.py b/searx/webapp.py index 54197557..a2a135e9 100644 --- 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