From e623ee593af95313c42c28e3db69a0e99974e692 Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Sun, 14 Dec 2014 23:27:27 +0100
Subject: [PATCH] Add icons and badge for the themes Add kickass in engine list
 Add content for the result from kickass

---
 searx/engines/kickass.py                    |   5 +++--
 searx/static/courgette/img/icon_kickass.ico | Bin 0 -> 1150 bytes
 searx/static/default/img/icon_kickass.ico   | Bin 0 -> 1150 bytes
 searx/static/oscar/img/icons/kickass.png    | Bin 0 -> 2019 bytes
 searx/webapp.py                             |   2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 searx/static/courgette/img/icon_kickass.ico
 create mode 100644 searx/static/default/img/icon_kickass.ico
 create mode 100644 searx/static/oscar/img/icons/kickass.png

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 0000000000000000000000000000000000000000..4aa2c77a578d0322b42542e862e4dfdf77da920f
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|*lXWF5VW6}`jvNn5+>
z5u+ZaM$W-IQ7^gZhiP%^e;8H|NxUs%<0=bNgNs)2314Sk+V<a~tOElZXIKA`ck~Xz
zrB~HEe2z_J&wm(>=$Z4sc>bFIjy3&oG4uR}zY31tcIaj(Ir|vfR&@SzsO|p`!m$$<
z{Qvgz*MAUr^!nZZjG4>9;vhNWl%jX&`i)|<Zn`#3`47W;FW&^~{rm6V|4-k(|9|=6
z6I>3YM$;#}0cM7}o4>4k<K+KdZ8PBb_VZU@{kt#T0E^|#TML&1sk2Nkc@ERB9~9Hz
z-#zy~GQRlm8Cd_(oA*(~VQPHZrvKM)^A`e{VUdu%FJ!{P|H$~@^}AsGuRnc35l2>|
z9}pP>((jN}el2p!vi~5QId9$n+51oZzxMPcSU-q3bmRX2d#~R9FIlz~tOlmmG%~pZ
zq~AHG;!51iRsTV_bon;8K6J*^J;%XnU}`O*Q(Hj#oia-HCC^>|AB5BAZ~Wh}<<S48
zjr;$9`SBBM#G2Dr!E!J)Fxosk5$t}OxQz1jg`57P<70Oof%V^i{T@Rub?&<VCV^4l
z@G}dJ5lWf0>R<NKZU2eIL3Q0vL2icu@1oix`73t*2jQ6RnO_noFZu=JgXn}w3x1}}
zTKN|y=9rXI4$}*wts|4fqr0YmbWF<5gNeImmn~12IR87cm|IrKf{?oI`!F^C>=_t-
k@G~%cU}s=>z|6pK0E8JC7#ctrs0b?t%7N4zGiG1_0JW|9m;e9(

literal 0
HcmV?d00001

diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icon_kickass.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4aa2c77a578d0322b42542e862e4dfdf77da920f
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|*lXWF5VW6}`jvNn5+>
z5u+ZaM$W-IQ7^gZhiP%^e;8H|NxUs%<0=bNgNs)2314Sk+V<a~tOElZXIKA`ck~Xz
zrB~HEe2z_J&wm(>=$Z4sc>bFIjy3&oG4uR}zY31tcIaj(Ir|vfR&@SzsO|p`!m$$<
z{Qvgz*MAUr^!nZZjG4>9;vhNWl%jX&`i)|<Zn`#3`47W;FW&^~{rm6V|4-k(|9|=6
z6I>3YM$;#}0cM7}o4>4k<K+KdZ8PBb_VZU@{kt#T0E^|#TML&1sk2Nkc@ERB9~9Hz
z-#zy~GQRlm8Cd_(oA*(~VQPHZrvKM)^A`e{VUdu%FJ!{P|H$~@^}AsGuRnc35l2>|
z9}pP>((jN}el2p!vi~5QId9$n+51oZzxMPcSU-q3bmRX2d#~R9FIlz~tOlmmG%~pZ
zq~AHG;!51iRsTV_bon;8K6J*^J;%XnU}`O*Q(Hj#oia-HCC^>|AB5BAZ~Wh}<<S48
zjr;$9`SBBM#G2Dr!E!J)Fxosk5$t}OxQz1jg`57P<70Oof%V^i{T@Rub?&<VCV^4l
z@G}dJ5lWf0>R<NKZU2eIL3Q0vL2icu@1oix`73t*2jQ6RnO_noFZu=JgXn}w3x1}}
zTKN|y=9rXI4$}*wts|4fqr0YmbWF<5gNeImmn~12IR87cm|IrKf{?oI`!F^C>=_t-
k@G~%cU}s=>z|6pK0E8JC7#ctrs0b?t%7N4zGiG1_0JW|9m;e9(

literal 0
HcmV?d00001

diff --git a/searx/static/oscar/img/icons/kickass.png b/searx/static/oscar/img/icons/kickass.png
new file mode 100644
index 0000000000000000000000000000000000000000..59e809104f5a46d8cf428f644b41df9593f43584
GIT binary patch
literal 2019
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
B-h2Q6

literal 0
HcmV?d00001

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