From 9234f2f15dd3cdd6bf85dcc75a8c844d999dd1fd Mon Sep 17 00:00:00 2001
From: ngosang <ngosang@hotmail.es>
Date: Wed, 10 Aug 2016 20:41:03 +0200
Subject: [PATCH 1/3] [Search engine] Remove KickassTorrents search engine

---
 src/searchengine.qrc                          |   4 -
 .../nova/engines/kickasstorrents.png          | Bin 619 -> 0 bytes
 .../nova/engines/kickasstorrents.py           |  70 ------------------
 src/searchengine/nova/engines/versions.txt    |   1 -
 .../nova3/engines/kickasstorrents.png         | Bin 619 -> 0 bytes
 .../nova3/engines/kickasstorrents.py          |  70 ------------------
 src/searchengine/nova3/engines/versions.txt   |   1 -
 7 files changed, 146 deletions(-)
 delete mode 100644 src/searchengine/nova/engines/kickasstorrents.png
 delete mode 100644 src/searchengine/nova/engines/kickasstorrents.py
 delete mode 100644 src/searchengine/nova3/engines/kickasstorrents.png
 delete mode 100644 src/searchengine/nova3/engines/kickasstorrents.py

diff --git a/src/searchengine.qrc b/src/searchengine.qrc
index 403f0e203..0ab74b4f7 100644
--- a/src/searchengine.qrc
+++ b/src/searchengine.qrc
@@ -11,8 +11,6 @@
         <file>searchengine/nova/engines/demonoid.py</file>
         <file>searchengine/nova/engines/extratorrent.png</file>
         <file>searchengine/nova/engines/extratorrent.py</file>
-        <file>searchengine/nova/engines/kickasstorrents.png</file>
-        <file>searchengine/nova/engines/kickasstorrents.py</file>
         <file>searchengine/nova/engines/legittorrents.png</file>
         <file>searchengine/nova/engines/legittorrents.py</file>
         <file>searchengine/nova/engines/mininova.png</file>
@@ -36,8 +34,6 @@
         <file>searchengine/nova3/engines/demonoid.py</file>
         <file>searchengine/nova3/engines/extratorrent.png</file>
         <file>searchengine/nova3/engines/extratorrent.py</file>
-        <file>searchengine/nova3/engines/kickasstorrents.png</file>
-        <file>searchengine/nova3/engines/kickasstorrents.py</file>
         <file>searchengine/nova3/engines/legittorrents.png</file>
         <file>searchengine/nova3/engines/legittorrents.py</file>
         <file>searchengine/nova3/engines/mininova.png</file>
diff --git a/src/searchengine/nova/engines/kickasstorrents.png b/src/searchengine/nova/engines/kickasstorrents.png
deleted file mode 100644
index 225b845f30dc7c8799ee518f8d739e819d40698d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003mP)t-s0000_
zMkrcQG+a|QVp%&yJRDC(Cq+9OOhY0|K_E*(A6ZZ@VOKXxKptyiK}$g$XkI*QVnJ6-
zDO^%7Wm`C7Sv6NnC3I>=c56phOe9xJA!}ebbZA0-a!Yt@Lw9OGYF#p6R40pmREvI6
zbZ0qoWHXnFTbYYopOIj4V=kbQV4{;@duua*Z#Su$W{G$`s+wf~|No|xS*n>{xu|c9
zc|4DOK$wO~ubpF*fklOLHIsoyor_PgpJ$<vRKKx;!nBCTyp_too7Ky#*wMS$)4ko-
z!Qa@zmxfH7j98C+L7<Uch;}%xo@uO~bFH3kuAOCubvLJ(XtJSawWf5orEA~W#p2w?
z=Hb!l<<{!w+wJP!?(5?3>)-P5>GbmJ_xAGn`1Jbu_Wu6;wx@No>lai2001#`QchC<
z5)u*@9UU$+K2ls<VQzDGcYuI|h@7COuD-s$#MIW=+u!Bq?(y{Z`1$(${r&#_C>+5X
z0002GNkl<ZcwSA#<CX(K7zW`tw%4}xHAb<$wsrs4u-&sKCwYEU0r2l6fw?`E*$rsR
zLhK$2Ar4N2$N=!2-HmMmNZ)7=^rm;|1(qzUSSf!|-O}Q~3g^G%s&dY!fK|qZwI`zX
z%PnJU8dxkTE&3?AVnD8-JkotZ>v(`*-Zaf;YM2-5TTs?)+iud&=ev3qO8C?;`rq_=
zZ5Z2d%}6P`=RGNpBltIeHPDWt7)k6qj<X)Xgw#R^u0MkjDh%`~LPG!m002ovPDHLk
FV1iHuCRP9d

diff --git a/src/searchengine/nova/engines/kickasstorrents.py b/src/searchengine/nova/engines/kickasstorrents.py
deleted file mode 100644
index 76c6e9395..000000000
--- a/src/searchengine/nova/engines/kickasstorrents.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#VERSION: 1.28
-#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
-#CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es)
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#    * Redistributions of source code must retain the above copyright notice,
-#      this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright
-#      notice, this list of conditions and the following disclaimer in the
-#      documentation and/or other materials provided with the distribution.
-#    * Neither the name of the author nor the names of its contributors may be
-#      used to endorse or promote products derived from this software without
-#      specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-from novaprinter import prettyPrinter
-from helpers import retrieve_url, download_file
-import json
-
-class kickasstorrents(object):
-    url = 'https://kat.cr'
-    name = 'Kickass Torrents'
-    supported_categories = {'all': '', 'movies': 'Movies', 'tv': 'TV', 'music': 'Music', 'games': 'Games', 'software': 'Applications'}
-
-    def __init__(self):
-        pass
-
-    def download_torrent(self, info):
-        print download_file(info, info)
-
-    def search(self, what, cat='all'):
-        i = 1
-        while True and i < 11:
-            json_data = retrieve_url(self.url+'/json.php?q=%s&page=%d'%(what, i))
-            try:
-                json_dict = json.loads(json_data)
-            except:
-                i += 1
-                continue
-            if int(json_dict['total_results']) <= 0:
-                return
-            for r in json_dict['list']:
-                try:
-                    if cat != 'all' and self.supported_categories[cat] != r['category']:
-                        continue
-                    res_dict = dict()
-                    res_dict['name'] = r['title']
-                    res_dict['size'] = str(r['size'])
-                    res_dict['seeds'] = r['seeds']
-                    res_dict['leech'] = r['leechs']
-                    res_dict['link'] = r['torrentLink']
-                    res_dict['desc_link'] = r['link'].replace('http://', 'https://')
-                    res_dict['engine_url'] = self.url
-                    prettyPrinter(res_dict)
-                except:
-                    pass
-            i += 1
diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt
index 74bec7feb..bb3d98ba8 100644
--- a/src/searchengine/nova/engines/versions.txt
+++ b/src/searchengine/nova/engines/versions.txt
@@ -1,7 +1,6 @@
 btdigg: 1.32
 demonoid: 1.21
 extratorrent: 2.04
-kickasstorrents: 1.28
 legittorrents: 2.01
 mininova: 2.02
 piratebay: 2.15
diff --git a/src/searchengine/nova3/engines/kickasstorrents.png b/src/searchengine/nova3/engines/kickasstorrents.png
deleted file mode 100644
index 225b845f30dc7c8799ee518f8d739e819d40698d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003mP)t-s0000_
zMkrcQG+a|QVp%&yJRDC(Cq+9OOhY0|K_E*(A6ZZ@VOKXxKptyiK}$g$XkI*QVnJ6-
zDO^%7Wm`C7Sv6NnC3I>=c56phOe9xJA!}ebbZA0-a!Yt@Lw9OGYF#p6R40pmREvI6
zbZ0qoWHXnFTbYYopOIj4V=kbQV4{;@duua*Z#Su$W{G$`s+wf~|No|xS*n>{xu|c9
zc|4DOK$wO~ubpF*fklOLHIsoyor_PgpJ$<vRKKx;!nBCTyp_too7Ky#*wMS$)4ko-
z!Qa@zmxfH7j98C+L7<Uch;}%xo@uO~bFH3kuAOCubvLJ(XtJSawWf5orEA~W#p2w?
z=Hb!l<<{!w+wJP!?(5?3>)-P5>GbmJ_xAGn`1Jbu_Wu6;wx@No>lai2001#`QchC<
z5)u*@9UU$+K2ls<VQzDGcYuI|h@7COuD-s$#MIW=+u!Bq?(y{Z`1$(${r&#_C>+5X
z0002GNkl<ZcwSA#<CX(K7zW`tw%4}xHAb<$wsrs4u-&sKCwYEU0r2l6fw?`E*$rsR
zLhK$2Ar4N2$N=!2-HmMmNZ)7=^rm;|1(qzUSSf!|-O}Q~3g^G%s&dY!fK|qZwI`zX
z%PnJU8dxkTE&3?AVnD8-JkotZ>v(`*-Zaf;YM2-5TTs?)+iud&=ev3qO8C?;`rq_=
zZ5Z2d%}6P`=RGNpBltIeHPDWt7)k6qj<X)Xgw#R^u0MkjDh%`~LPG!m002ovPDHLk
FV1iHuCRP9d

diff --git a/src/searchengine/nova3/engines/kickasstorrents.py b/src/searchengine/nova3/engines/kickasstorrents.py
deleted file mode 100644
index c11cc1545..000000000
--- a/src/searchengine/nova3/engines/kickasstorrents.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#VERSION: 1.28
-#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
-#CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es)
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#    * Redistributions of source code must retain the above copyright notice,
-#      this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright
-#      notice, this list of conditions and the following disclaimer in the
-#      documentation and/or other materials provided with the distribution.
-#    * Neither the name of the author nor the names of its contributors may be
-#      used to endorse or promote products derived from this software without
-#      specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-from novaprinter import prettyPrinter
-from helpers import retrieve_url, download_file
-import json
-
-class kickasstorrents(object):
-    url = 'https://kat.cr'
-    name = 'Kickass Torrents'
-    supported_categories = {'all': '', 'movies': 'Movies', 'tv': 'TV', 'music': 'Music', 'games': 'Games', 'software': 'Applications'}
-
-    def __init__(self):
-        pass
-
-    def download_torrent(self, info):
-        print(download_file(info, info))
-
-    def search(self, what, cat='all'):
-        i = 1
-        while True and i < 11:
-            json_data = retrieve_url(self.url+'/json.php?q=%s&page=%d'%(what, i))
-            try:
-                json_dict = json.loads(json_data)
-            except:
-                i += 1
-                continue
-            if int(json_dict['total_results']) <= 0:
-                return
-            for r in json_dict['list']:
-                try:
-                    if cat != 'all' and self.supported_categories[cat] != r['category']:
-                        continue
-                    res_dict = dict()
-                    res_dict['name'] = r['title']
-                    res_dict['size'] = str(r['size'])
-                    res_dict['seeds'] = r['seeds']
-                    res_dict['leech'] = r['leechs']
-                    res_dict['link'] = r['torrentLink']
-                    res_dict['desc_link'] = r['link'].replace('http://', 'https://')
-                    res_dict['engine_url'] = self.url
-                    prettyPrinter(res_dict)
-                except:
-                    pass
-            i += 1
diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt
index 74bec7feb..bb3d98ba8 100644
--- a/src/searchengine/nova3/engines/versions.txt
+++ b/src/searchengine/nova3/engines/versions.txt
@@ -1,7 +1,6 @@
 btdigg: 1.32
 demonoid: 1.21
 extratorrent: 2.04
-kickasstorrents: 1.28
 legittorrents: 2.01
 mininova: 2.02
 piratebay: 2.15

From 4e2de9890364738fc9083aacf2e03d325a86e66e Mon Sep 17 00:00:00 2001
From: ngosang <ngosang@hotmail.es>
Date: Wed, 10 Aug 2016 20:43:49 +0200
Subject: [PATCH 2/3] [Search engine] Remove BTDigg search engine

---
 src/searchengine.qrc                        |   4 --
 src/searchengine/nova/engines/btdigg.png    | Bin 400 -> 0 bytes
 src/searchengine/nova/engines/btdigg.py     |  64 --------------------
 src/searchengine/nova/engines/versions.txt  |   1 -
 src/searchengine/nova3/engines/btdigg.png   | Bin 400 -> 0 bytes
 src/searchengine/nova3/engines/btdigg.py    |  64 --------------------
 src/searchengine/nova3/engines/versions.txt |   1 -
 7 files changed, 134 deletions(-)
 delete mode 100644 src/searchengine/nova/engines/btdigg.png
 delete mode 100644 src/searchengine/nova/engines/btdigg.py
 delete mode 100644 src/searchengine/nova3/engines/btdigg.png
 delete mode 100644 src/searchengine/nova3/engines/btdigg.py

diff --git a/src/searchengine.qrc b/src/searchengine.qrc
index 0ab74b4f7..567dc2e8e 100644
--- a/src/searchengine.qrc
+++ b/src/searchengine.qrc
@@ -5,8 +5,6 @@
         <file>searchengine/nova/nova2.py</file>
         <file>searchengine/nova/novaprinter.py</file>
         <file>searchengine/nova/socks.py</file>
-        <file>searchengine/nova/engines/btdigg.png</file>
-        <file>searchengine/nova/engines/btdigg.py</file>
         <file>searchengine/nova/engines/demonoid.png</file>
         <file>searchengine/nova/engines/demonoid.py</file>
         <file>searchengine/nova/engines/extratorrent.png</file>
@@ -28,8 +26,6 @@
         <file>searchengine/nova3/novaprinter.py</file>
         <file>searchengine/nova3/sgmllib3.py</file>
         <file>searchengine/nova3/socks.py</file>
-        <file>searchengine/nova3/engines/btdigg.png</file>
-        <file>searchengine/nova3/engines/btdigg.py</file>
         <file>searchengine/nova3/engines/demonoid.png</file>
         <file>searchengine/nova3/engines/demonoid.py</file>
         <file>searchengine/nova3/engines/extratorrent.png</file>
diff --git a/src/searchengine/nova/engines/btdigg.png b/src/searchengine/nova/engines/btdigg.png
deleted file mode 100644
index 9d3ee656f82249b63d042c6d0973bd74f0e1a8e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00A&bL_t(I%bk-wOG8l%hM!#OBsjR}
z;0Fb9C~~Oc?CRtoC{|}jMcmFmFq5E@vmL4w1VK;`#BPE}C9_DOpy;27%c;~0g<hW}
z@RGbIIV6xnO)6?KrY2Q2xlGy}1ISVWYEnwt3eW<!fK4^I23FN%T1~#yq|&PakiM4>
zfo<R|#X*b!d%#Hy?vjcpV(>3DafahH24DQ`Kutb@NrvYFcm{5>BrH*k8n6R&Gc{=e
zAAlD$X#wTl2v@**K?4Vxq9#pXgW}x8;A^5L3&1XL@DG#w67ZgurzkTqcsB#4fHR<8
zaQ>(KCbog<kOmnr8-sVUKCvEyOYW6C=fDfFAA@)P98(N_tS063C*!HRMk+i4+Q4HB
uz8r&}_Ks;FYVwd`Lrvz?WK>P&^LanhN@sCfV%HY{0000<MNUMnLSTY-NS<8)

diff --git a/src/searchengine/nova/engines/btdigg.py b/src/searchengine/nova/engines/btdigg.py
deleted file mode 100644
index d243b3296..000000000
--- a/src/searchengine/nova/engines/btdigg.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#VERSION: 1.32
-#AUTHORS: BTDigg team (research@btdigg.org)
-# Contributors: Diego de las Heras (ngosang@hotmail.es)
-
-#                    GNU GENERAL PUBLIC LICENSE
-#                       Version 3, 29 June 2007
-#
-#                   <http://www.gnu.org/licenses/>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-from novaprinter import prettyPrinter
-from helpers import retrieve_url, download_file
-import urllib
-import sys
-
-class btdigg(object):
-    url = 'https://btdigg.org'
-    name = 'BTDigg'
-
-    supported_categories = {'all': ''}
-
-    def __init__(self):
-        pass
-
-    def search(self, what, cat='all'):
-        req = urllib.unquote(what)
-        i = 0
-        results = 0
-        while i < 3:
-            data = retrieve_url('https://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % urllib.urlencode(dict(q = req, p = i)))
-            for line in data.splitlines():
-                if line.startswith('#'):
-                    continue
-
-                info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6]
-                name = name.replace('|', '')
-
-                res = dict(link = 'magnet:?xt=urn:btih:%s&dn=%s' % (info_hash, urllib.quote(name.encode('utf8'))),
-                           name = name,
-                           size = size,
-                           seeds = int(dl),
-                           leech = int(dl),
-                           engine_url = self.url,
-                           desc_link = '%s/search?%s' % (self.url, urllib.urlencode(dict(info_hash = info_hash, q = req))))
-
-                prettyPrinter(res)
-                results += 1
-
-            if results == 0:
-                break
-            i += 1
-
-if __name__ == "__main__":
-    s = btdigg()
-    s.search(sys.argv[1])
diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt
index bb3d98ba8..a0cccb522 100644
--- a/src/searchengine/nova/engines/versions.txt
+++ b/src/searchengine/nova/engines/versions.txt
@@ -1,4 +1,3 @@
-btdigg: 1.32
 demonoid: 1.21
 extratorrent: 2.04
 legittorrents: 2.01
diff --git a/src/searchengine/nova3/engines/btdigg.png b/src/searchengine/nova3/engines/btdigg.png
deleted file mode 100644
index 9d3ee656f82249b63d042c6d0973bd74f0e1a8e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00A&bL_t(I%bk-wOG8l%hM!#OBsjR}
z;0Fb9C~~Oc?CRtoC{|}jMcmFmFq5E@vmL4w1VK;`#BPE}C9_DOpy;27%c;~0g<hW}
z@RGbIIV6xnO)6?KrY2Q2xlGy}1ISVWYEnwt3eW<!fK4^I23FN%T1~#yq|&PakiM4>
zfo<R|#X*b!d%#Hy?vjcpV(>3DafahH24DQ`Kutb@NrvYFcm{5>BrH*k8n6R&Gc{=e
zAAlD$X#wTl2v@**K?4Vxq9#pXgW}x8;A^5L3&1XL@DG#w67ZgurzkTqcsB#4fHR<8
zaQ>(KCbog<kOmnr8-sVUKCvEyOYW6C=fDfFAA@)P98(N_tS063C*!HRMk+i4+Q4HB
uz8r&}_Ks;FYVwd`Lrvz?WK>P&^LanhN@sCfV%HY{0000<MNUMnLSTY-NS<8)

diff --git a/src/searchengine/nova3/engines/btdigg.py b/src/searchengine/nova3/engines/btdigg.py
deleted file mode 100644
index 15d25826c..000000000
--- a/src/searchengine/nova3/engines/btdigg.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#VERSION: 1.32
-#AUTHORS: BTDigg team (research@btdigg.org)
-# Contributors: Diego de las Heras (ngosang@hotmail.es)
-
-#                    GNU GENERAL PUBLIC LICENSE
-#                       Version 3, 29 June 2007
-#
-#                   <http://www.gnu.org/licenses/>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-from novaprinter import prettyPrinter
-from helpers import retrieve_url, download_file
-import urllib
-import sys
-
-class btdigg(object):
-    url = 'https://btdigg.org'
-    name = 'BTDigg'
-
-    supported_categories = {'all': ''}
-
-    def __init__(self):
-        pass
-
-    def search(self, what, cat='all'):
-        req = urllib.parse.unquote(what)
-        i = 0
-        results = 0
-        while i < 3:
-            data = retrieve_url('https://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % urllib.parse.urlencode(dict(q = req, p = i)))
-            for line in data.splitlines():
-                if line.startswith('#'):
-                    continue
-
-                info_hash, name, files, size, dl, seen = line.strip().split('\t')[:6]
-                name = name.replace('|', '')
-
-                res = dict(link = 'magnet:?xt=urn:btih:%s&dn=%s' % (info_hash, urllib.parse.quote(name)),
-                           name = name,
-                           size = size,
-                           seeds = int(dl),
-                           leech = int(dl),
-                           engine_url = self.url,
-                           desc_link = '%s/search?%s' % (self.url, urllib.parse.urlencode(dict(info_hash = info_hash, q = req))))
-
-                prettyPrinter(res)
-                results += 1
-
-            if results == 0:
-                break
-            i += 1
-
-if __name__ == "__main__":
-    s = btdigg()
-    s.search(sys.argv[1])
diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt
index bb3d98ba8..a0cccb522 100644
--- a/src/searchengine/nova3/engines/versions.txt
+++ b/src/searchengine/nova3/engines/versions.txt
@@ -1,4 +1,3 @@
-btdigg: 1.32
 demonoid: 1.21
 extratorrent: 2.04
 legittorrents: 2.01

From b0c9c8a2aa4782bade1b01c0b9be772c7bbbe470 Mon Sep 17 00:00:00 2001
From: ngosang <ngosang@hotmail.es>
Date: Mon, 22 Aug 2016 23:25:54 +0200
Subject: [PATCH 3/3] [Search engine] Update Torrentz search engine

---
 src/searchengine/nova/engines/torrentz.py   | 6 +++---
 src/searchengine/nova/engines/versions.txt  | 2 +-
 src/searchengine/nova3/engines/torrentz.py  | 6 +++---
 src/searchengine/nova3/engines/versions.txt | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/searchengine/nova/engines/torrentz.py b/src/searchengine/nova/engines/torrentz.py
index 00f04ebca..4d031fe55 100644
--- a/src/searchengine/nova/engines/torrentz.py
+++ b/src/searchengine/nova/engines/torrentz.py
@@ -1,4 +1,4 @@
-#VERSION: 2.20
+#VERSION: 2.21
 #AUTHORS: Diego de las Heras (ngosang@hotmail.es)
 
 # Redistribution and use in source and binary forms, with or without
@@ -32,8 +32,8 @@ from urllib import urlencode
 
 class torrentz(object):
     # mandatory properties
-    url  = 'https://torrentz.eu'
-    name = 'Torrentz'
+    url  = 'https://torrentz2.eu'
+    name = 'Torrentz2'
     supported_categories = {'all': ''}
 
     trackers_list = ['udp://tracker.coppersurfer.tk:6969/announce',
diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt
index a0cccb522..dd90ab3d5 100644
--- a/src/searchengine/nova/engines/versions.txt
+++ b/src/searchengine/nova/engines/versions.txt
@@ -5,4 +5,4 @@ mininova: 2.02
 piratebay: 2.15
 torlock: 2.0
 torrentreactor: 1.42
-torrentz: 2.20
+torrentz: 2.21
diff --git a/src/searchengine/nova3/engines/torrentz.py b/src/searchengine/nova3/engines/torrentz.py
index ea4286012..07a2d8017 100644
--- a/src/searchengine/nova3/engines/torrentz.py
+++ b/src/searchengine/nova3/engines/torrentz.py
@@ -1,4 +1,4 @@
-#VERSION: 2.20
+#VERSION: 2.21
 #AUTHORS: Diego de las Heras (ngosang@hotmail.es)
 
 # Redistribution and use in source and binary forms, with or without
@@ -32,8 +32,8 @@ from urllib.parse import urlencode
 
 class torrentz(object):
     # mandatory properties
-    url  = 'https://torrentz.eu'
-    name = 'Torrentz'
+    url  = 'https://torrentz2.eu'
+    name = 'Torrentz2'
     supported_categories = {'all': ''}
 
     trackers_list = ['udp://tracker.coppersurfer.tk:6969/announce',
diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt
index a0cccb522..dd90ab3d5 100644
--- a/src/searchengine/nova3/engines/versions.txt
+++ b/src/searchengine/nova3/engines/versions.txt
@@ -5,4 +5,4 @@ mininova: 2.02
 piratebay: 2.15
 torlock: 2.0
 torrentreactor: 1.42
-torrentz: 2.20
+torrentz: 2.21