From de74f9298f590193a939922946c38dc64353d8ac Mon Sep 17 00:00:00 2001
From: sledgehammer999 <hammered999@gmail.com>
Date: Fri, 2 Jun 2017 01:32:10 +0300
Subject: [PATCH] Remove all search plugins from repo.

---
 src/searchengine.qrc                          |  24 ---
 src/searchengine/nova/engines/__init__.py     |   0
 src/searchengine/nova/engines/btdb.png        | Bin 562 -> 0 bytes
 src/searchengine/nova/engines/btdb.py         | 147 ---------------
 src/searchengine/nova/engines/demonoid.png    | Bin 675 -> 0 bytes
 src/searchengine/nova/engines/demonoid.py     | 144 --------------
 .../nova/engines/legittorrents.png            | Bin 532 -> 0 bytes
 .../nova/engines/legittorrents.py             | 101 ----------
 src/searchengine/nova/engines/piratebay.png   | Bin 278 -> 0 bytes
 src/searchengine/nova/engines/piratebay.py    | 176 ------------------
 src/searchengine/nova/engines/torlock.png     | Bin 561 -> 0 bytes
 src/searchengine/nova/engines/torlock.py      |  97 ----------
 src/searchengine/nova/engines/torrentz.png    | Bin 122 -> 0 bytes
 src/searchengine/nova/engines/torrentz.py     | 119 ------------
 src/searchengine/nova/engines/versions.txt    |   6 -
 src/searchengine/nova3/engines/__init__.py    |   0
 src/searchengine/nova3/engines/btdb.png       | Bin 562 -> 0 bytes
 src/searchengine/nova3/engines/btdb.py        | 147 ---------------
 src/searchengine/nova3/engines/demonoid.png   | Bin 675 -> 0 bytes
 src/searchengine/nova3/engines/demonoid.py    | 144 --------------
 .../nova3/engines/legittorrents.png           | Bin 532 -> 0 bytes
 .../nova3/engines/legittorrents.py            | 101 ----------
 src/searchengine/nova3/engines/piratebay.png  | Bin 278 -> 0 bytes
 src/searchengine/nova3/engines/piratebay.py   | 176 ------------------
 src/searchengine/nova3/engines/torlock.png    | Bin 561 -> 0 bytes
 src/searchengine/nova3/engines/torlock.py     |  97 ----------
 src/searchengine/nova3/engines/torrentz.png   | Bin 122 -> 0 bytes
 src/searchengine/nova3/engines/torrentz.py    | 119 ------------
 src/searchengine/nova3/engines/versions.txt   |   6 -
 29 files changed, 1604 deletions(-)
 delete mode 100644 src/searchengine/nova/engines/__init__.py
 delete mode 100644 src/searchengine/nova/engines/btdb.png
 delete mode 100644 src/searchengine/nova/engines/btdb.py
 delete mode 100644 src/searchengine/nova/engines/demonoid.png
 delete mode 100644 src/searchengine/nova/engines/demonoid.py
 delete mode 100644 src/searchengine/nova/engines/legittorrents.png
 delete mode 100644 src/searchengine/nova/engines/legittorrents.py
 delete mode 100644 src/searchengine/nova/engines/piratebay.png
 delete mode 100644 src/searchengine/nova/engines/piratebay.py
 delete mode 100644 src/searchengine/nova/engines/torlock.png
 delete mode 100644 src/searchengine/nova/engines/torlock.py
 delete mode 100644 src/searchengine/nova/engines/torrentz.png
 delete mode 100644 src/searchengine/nova/engines/torrentz.py
 delete mode 100644 src/searchengine/nova/engines/versions.txt
 delete mode 100644 src/searchengine/nova3/engines/__init__.py
 delete mode 100644 src/searchengine/nova3/engines/btdb.png
 delete mode 100644 src/searchengine/nova3/engines/btdb.py
 delete mode 100644 src/searchengine/nova3/engines/demonoid.png
 delete mode 100644 src/searchengine/nova3/engines/demonoid.py
 delete mode 100644 src/searchengine/nova3/engines/legittorrents.png
 delete mode 100644 src/searchengine/nova3/engines/legittorrents.py
 delete mode 100644 src/searchengine/nova3/engines/piratebay.png
 delete mode 100644 src/searchengine/nova3/engines/piratebay.py
 delete mode 100644 src/searchengine/nova3/engines/torlock.png
 delete mode 100644 src/searchengine/nova3/engines/torlock.py
 delete mode 100644 src/searchengine/nova3/engines/torrentz.png
 delete mode 100644 src/searchengine/nova3/engines/torrentz.py
 delete mode 100644 src/searchengine/nova3/engines/versions.txt

diff --git a/src/searchengine.qrc b/src/searchengine.qrc
index 2f94cae5f..35dea1b8a 100644
--- a/src/searchengine.qrc
+++ b/src/searchengine.qrc
@@ -5,35 +5,11 @@
         <file>searchengine/nova/nova2.py</file>
         <file>searchengine/nova/novaprinter.py</file>
         <file>searchengine/nova/socks.py</file>
-        <file>searchengine/nova/engines/btdb.png</file>
-        <file>searchengine/nova/engines/btdb.py</file>
-        <file>searchengine/nova/engines/demonoid.png</file>
-        <file>searchengine/nova/engines/demonoid.py</file>
-        <file>searchengine/nova/engines/legittorrents.png</file>
-        <file>searchengine/nova/engines/legittorrents.py</file>
-        <file>searchengine/nova/engines/piratebay.png</file>
-        <file>searchengine/nova/engines/piratebay.py</file>
-        <file>searchengine/nova/engines/torlock.png</file>
-        <file>searchengine/nova/engines/torlock.py</file>
-        <file>searchengine/nova/engines/torrentz.png</file>
-        <file>searchengine/nova/engines/torrentz.py</file>
         <file>searchengine/nova3/helpers.py</file>
         <file>searchengine/nova3/nova2.py</file>
         <file>searchengine/nova3/novaprinter.py</file>
         <file>searchengine/nova3/sgmllib3.py</file>
         <file>searchengine/nova3/socks.py</file>
-        <file>searchengine/nova3/engines/btdb.png</file>
-        <file>searchengine/nova3/engines/btdb.py</file>
-        <file>searchengine/nova3/engines/demonoid.png</file>
-        <file>searchengine/nova3/engines/demonoid.py</file>
-        <file>searchengine/nova3/engines/legittorrents.png</file>
-        <file>searchengine/nova3/engines/legittorrents.py</file>
-        <file>searchengine/nova3/engines/piratebay.png</file>
-        <file>searchengine/nova3/engines/piratebay.py</file>
-        <file>searchengine/nova3/engines/torlock.png</file>
-        <file>searchengine/nova3/engines/torlock.py</file>
-        <file>searchengine/nova3/engines/torrentz.png</file>
-        <file>searchengine/nova3/engines/torrentz.py</file>
         <file>searchengine/nova/nova2dl.py</file>
         <file>searchengine/nova3/nova2dl.py</file>
     </qresource>
diff --git a/src/searchengine/nova/engines/__init__.py b/src/searchengine/nova/engines/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/searchengine/nova/engines/btdb.png b/src/searchengine/nova/engines/btdb.png
deleted file mode 100644
index b63314b9ddd57f2c1da6902082cddf758e9f43a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;RF;E1sy(Vm%ji20l!H^
zK~y-)os%((8bKI_pIH}Fbiu|Pw?!l?9B8gkh}f)!XK__JQyf=_q{=T4dkOgs78Zg@
z5eq>O0%B(?1kOgd4cQ`%#TF}sU3Z-n*$YVs<n*bgnCBg4=6eNykvEJ>gt!G>NhzNJ
z2qC@zACYo&Z&`Q0?-vh?=NA|1_aOKHyaeL>8xNQ!RrO}Q*#y4=BKZ?=#p75cRrPwk
z*#rtebn;_mfUC$s<PGC8rmCNV;AhwocmiH1PtMNXoFD_l5#m-93WaZ`X`Z)QEnL@S
zI2_V$w@IhdOePbW%_ffHFdmOF41;R5itD;`yIr~8?`_5NymMXG(RH12xlBABXEvLW
zNF<og=NN`Tuh*l~=}@Uu$Ye4!8Vxi}JA`5QREhqX?RLv*wW40H<2Vk!@3Y(O5JI3R
z3Wvi1Aq2K<V_6opTFnPUESt@~PNh<*VzH>WuFGIBAPhq^O=G!SVwxtUQi*=QkL$YR
zaye|<W;7bbeBb{n^7;H*DP{MBM??tmPC?4|(S#j~hm<2Fn(gTc0n>ZSx>Ep>s(J$~
zj*u6Tg95PLY=We!UIXL*T*m{(4?Xy!ji=W62TUuy?ID8`aR2}S07*qoM6N<$f>+Py
Ax&QzG

diff --git a/src/searchengine/nova/engines/btdb.py b/src/searchengine/nova/engines/btdb.py
deleted file mode 100644
index 58ed79c78..000000000
--- a/src/searchengine/nova/engines/btdb.py
+++ /dev/null
@@ -1,147 +0,0 @@
-#VERSION: 1.01
-#AUTHORS: Charles Worthing
-#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 HTMLParser import HTMLParser
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class btdb(object):
-    """ Search engine class """
-    url = 'https://btdb.in'
-    name = 'BTDB'
-
-    def download_torrent(self, info):
-        """ Downloader """
-        print(download_file(info))
-
-    class MyHtmlParser(HTMLParser):
-        """ Parser class """
-        def __init__(self, results, url):
-            HTMLParser.__init__(self)
-            self.results = results
-            self.url = url
-            self.current_item = {} # One torrent result
-            self.add_query = True
-            self.torrent_info_index = 0 # Count of the meta data encountered
-            self.torrent_info_array = []
-            self.meta_data_grabbing = 0
-            self.meta_data_array = []
-            self.torrent_no_files = 0
-            self.torrent_date_added = 0
-            self.torrent_popularity = 0
-            self.mangnet_link = ""
-            self.desc_link = ""
-            self.torrent_name = ""
-
-        def handle_starttag(self, tag, attrs):
-            if tag == "span":
-                span_dict = dict(attrs)
-                if "class" in span_dict:
-                    the_class = span_dict["class"]
-                    if the_class == "item-meta-info-value":
-                        self.meta_data_grabbing += 1
-                    else:
-                        self.meta_data_grabbing = 0
-            if tag == "script":
-                return
-            if tag == "li":
-                for attr in attrs:
-                    if attr[1] == "search-ret-item":
-                        self.torrent_info_index = 1
-            if tag == "a":
-                if self.torrent_info_index > 0:
-                    params = dict(attrs)
-                    if "href" in params:
-                        link = params["href"]
-                        if link.startswith("/torrent"):
-                            self.desc_link = "".join((self.url, link))
-                            self.torrent_name = params["title"]
-                        if link.startswith("magnet:"):
-                            self.mangnet_link = link
-
-        def handle_endtag(self, tag): 
-            if tag == "script":
-                return
-            if tag == "div":
-                if self.meta_data_grabbing > 0:
-                    
-                    self.torrent_no_files = self.meta_data_array[2] # Not used
-                    self.torrent_date_added = self.meta_data_array[4] # Not used
-                    self.torrent_popularity = self.meta_data_array[6] # Not used
-
-                    self.current_item["size"] = self.meta_data_array[0]
-                    self.current_item["name"] = self.torrent_name
-                    self.current_item["engine_url"] = self.url
-                    self.current_item["link"] = self.mangnet_link
-                    self.current_item["desc_link"] = self.desc_link
-                    self.current_item["seeds"] = -1
-                    self.current_item["leech"] = -1
-
-                    prettyPrinter(self.current_item)
-                    self.results.append('a')
-                    self.current_item = {}
-
-                    self.meta_data_grabbing = 0
-                    self.meta_data_array = []
-                    self.mangnet_link = ""
-                    self.desc_link = ""
-                    self.torrent_name = ""
-
-        def handle_data(self, data):
-            if self.torrent_info_index > 0:
-                self.torrent_info_array.append(data)
-                self.torrent_info_index += 1
-            if self.meta_data_grabbing > 0:
-                self.meta_data_array.append(data)
-                self.meta_data_grabbing += 1
-
-        def handle_entityref(self, name):
-            c = unichr(name2codepoint[name])
-
-        def handle_charref(self, name):
-            if name.startswith('x'):
-                c = unichr(int(name[1:], 16))
-            else:
-                c = unichr(int(name))
-
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        results_list = []
-        parser = self.MyHtmlParser(results_list, self.url)
-        i = 1
-        while i < 31:
-            # "what" is already urlencoded
-            html = retrieve_url(self.url + '/q/%s/%d?sort=popular' % (what, i))
-            parser.feed(html)
-            if len(results_list) < 1:
-                break
-            del results_list[:]
-            i += 1
-        parser.close()
diff --git a/src/searchengine/nova/engines/demonoid.png b/src/searchengine/nova/engines/demonoid.png
deleted file mode 100644
index 71eb564420cc35634786d17ce137c308d33a0fd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00KivL_t(I%f*w=OB8V!#y{WP*>QiE
zxw|cC2)ZRGSx6Rv7!?x*(V-x^cF0RXmo8CI(6tCUdNPRa_7^x_3e!vB+Ll`6x@xjE
zy1&NRnQ`XZK~^a;y!D<Q-k0~`<$0e6{%2{LCPf|8o4T%xy)4$TQU`Y*NAaWtc80sv
z;C&Zx7=9MpAuv`w(w&VwdJ$!Dp-RV*IH6Dg&-VdI$*?gDo8|;qmd*FCH6TWyPEab^
zhyd6%$)}GcjMW;BBe6^$%k+svRmw$&h4}*ENCPuj16|j}Hi1(MA*Cb`5L~|2PCOaL
zu_f=umhpU#P0yn(?bC9onW|Z&kdOVYflxL;HW5^O3Wasdsz*ps={}ZZeKkm>x=1AE
zp@dvQ!6q!{2b!kIpr&c^_QM7`4#&vNm&i;CRQD2{tv8sO+~mT*J-XYkGn)zXcJwDg
zMA>i_IDOV<YCN%Z!SYg>=?{&l?m7BToZ;lDUQ($f<#Gi@QAi}4X*t-+)hjnirP_G<
z`~kh^vs;(f|2lZ<4t;&c2}c{SHY`+C#dTdOl?w5AoP0h{B9S1Mo2OVbdG&e-e0A#!
zx~_}imqXNSht`%h=H}*DSy`d0s|(XK$!4?k^z`7mKE+~%a@hc1Mb~u^tc#dVr=R4O
z$7$RLW1|!7Z#qCM+Qj>b3BG)uArOG<>=+{>Z<x-^Y&%x`Y0>_R7M?5<4Ep#|B7K4F
zlrYxTD6LB>O9Q{zUHr@E>7xeWa0JJ#@hy}1YgWWwL$h1RegVC73D~!lN%;T(002ov
JPDHLkV1joxH%<Tm

diff --git a/src/searchengine/nova/engines/demonoid.py b/src/searchengine/nova/engines/demonoid.py
deleted file mode 100644
index 53a6ff509..000000000
--- a/src/searchengine/nova/engines/demonoid.py
+++ /dev/null
@@ -1,144 +0,0 @@
-#VERSION: 1.23
-#AUTHORS: Douman (custparasite@gmx.se)
-#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 HTMLParser import HTMLParser
-from re import compile as re_compile
-from re import DOTALL
-from itertools import islice
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class demonoid(object):
-    """ Search engine class """
-    url = "https://www.demonoid.pw"
-    name = "Demonoid"
-    supported_categories = {'all': '0',
-                            'music': '2',
-                            'movies': '1',
-                            'games': '4',
-                            'software': '5',
-                            'books': '11',
-                            'anime': '9',
-                            'tv': '3'}
-
-    def download_torrent(self, info):
-        """ Downloader """
-        print(download_file(info))
-
-    class MyHtmlParseWithBlackJack(HTMLParser):
-        """ Parser class """
-        def __init__(self, url):
-            HTMLParser.__init__(self)
-            self.url = url
-            self.current_item = None
-            self.save_data = None
-            self.seeds_leech = False
-            self.size_repl = re_compile(",")
-
-        def handle_starttag(self, tag, attrs):
-            """ Parser's start tag handler """
-            if tag == "a":
-                params = dict(attrs)
-                if "href" in params:
-                    link = params["href"]
-                    if link.startswith("/files/details"):
-                        self.current_item = dict()
-                        self.current_item["desc_link"] = "".join((self.url, link))
-                        self.current_item["engine_url"] = self.url
-                        self.save_data = "name"
-                    elif link.startswith("/files/download"):
-                        self.current_item["link"] = "".join((self.url, link))
-
-            elif self.current_item:
-                if tag == "td":
-                    params = dict(attrs)
-                    if "class" in params and "align" in params:
-                        if params["class"].startswith("tone"):
-                            if params["align"] == "right":
-                                self.save_data = "size"
-                            elif params["align"] == "center":
-                                self.seeds_leech = True
-
-                elif self.seeds_leech and tag == "font":
-                    for attr in attrs:
-                        if "class" in attr:
-                            if attr[1] == "green":
-                                self.save_data = "seeds"
-                            elif attr[1] == "red":
-                                self.save_data = "leech"
-
-                    self.seeds_leech = False
-
-
-        def handle_data(self, data):
-            """ Parser's data handler """
-            if self.save_data:
-                if self.save_data == "name":
-                    # names with special characters like '&' are splitted in several pieces
-                    if 'name' not in self.current_item:
-                        self.current_item['name'] = ''
-                    self.current_item['name'] += data
-                else:
-                    self.current_item[self.save_data] = data
-                    self.save_data = None
-                if self.current_item.__len__() == 7:
-                    self.current_item["size"] = self.size_repl.sub("", self.current_item["size"])
-                    prettyPrinter(self.current_item)
-                    self.current_item = None
-
-        def handle_endtag(self, tag):
-            """ Parser's end tag handler """
-            if self.save_data == "name":
-                self.save_data = None
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        #prepare query
-        cat = self.supported_categories[cat.lower()]
-        query = "".join((self.url, "/files/?category=", cat, "&subcategory=All&quality=All&seeded=2&external=2&query=", what, "&uid=0&sort=S"))
-
-        data = retrieve_url(query)
-
-        add_res_list = re_compile("/files.*page=[0-9]+")
-        torrent_list = re_compile("start torrent list -->(.*)<!-- end torrent", DOTALL)
-        data = torrent_list.search(data).group(0)
-        list_results = add_res_list.findall(data)
-
-        parser = self.MyHtmlParseWithBlackJack(self.url)
-        parser.feed(data)
-
-        del data
-
-        if list_results:
-            for search_query in islice((add_res_list.search(result).group(0) for result in list_results[1].split(" | ")), 0, 5):
-                response = retrieve_url(self.url + search_query)
-                parser.feed(torrent_list.search(response).group(0))
-                parser.close()
-
-        return
diff --git a/src/searchengine/nova/engines/legittorrents.png b/src/searchengine/nova/engines/legittorrents.png
deleted file mode 100644
index eb8f33d7126faa334ebc077305cc29d17a75d0b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002tP)t-s|NsB|
z{QUa*`ttJf`1tsP+!}Sx4f^`}@bK`n&ynit>T}EsaLEXP+8BG(6M4}Pe%BRk#s!Ao
z9f;u{Ys3SPzgX<-?3>GBw9u1?+9=xE+Q8VN=<DUB&2`}5;EdBblh;Jc;;*sUf~2yP
zi_$o-*ny<6l!w(RuGWB~v6RKox2@HFqp_2-(2}gweWS3G$;-y8(tM(@lCR))qRMmG
z+1U2>_M)$ngv~8@yeNylPL07(pv!LJ>Du)4^sTv|m!*fb*p1rT+MvRCkH1!>vXzp-
zTBFQ#=j`J2^z`=j_C8z=JOBUyOLS6BQvd)13I+ZB0St8#{r&y@{r&y@{r#m8s&eon
zV;GVh+Rs&nYTJft>xODchH7+%YBh#xmy9I`YUkOpu8|`LU3hRJg{Eqxi5dw8Jbp*d
z0001&Nkl<ZcwSY^)e^!m5QfogDhXAA7I$}dcX|H@0+K01zPmj$|009{%Pb6t1wktj
z`P5BkxZpuD${S+_WE!t5Jg=TF6bYZmTI!%E*_<W=;(>HE%@Y5~lgf@$#pn-ememlT
zY1?f9I;z?eps(vg0Y-)~(dZ0*Fn8VMYQ5QpvfIa4#}LTreDVF;{Sg9?C#6(+eeX9C
Wunh6r;TL590000<MNUMnLSTZvnHClR

diff --git a/src/searchengine/nova/engines/legittorrents.py b/src/searchengine/nova/engines/legittorrents.py
deleted file mode 100644
index 5cacfc826..000000000
--- a/src/searchengine/nova/engines/legittorrents.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#VERSION: 2.02
-#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
-#         Douman (custparasite@gmx.se)
-
-# 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
-from HTMLParser import HTMLParser
-from re import compile as re_compile
-
-class legittorrents(object):
-    url = 'http://www.legittorrents.info'
-    name = 'Legit Torrents'
-    supported_categories = {'all': '0', 'movies': '1', 'tv': '13', 'music': '2', 'games': '3', 'anime': '5', 'books': '6'}
-
-    def download_torrent(self, info):
-        print(download_file(info))
-
-    class MyHtmlParseWithBlackJack(HTMLParser):
-        """ Parser class """
-        def __init__(self, url):
-            HTMLParser.__init__(self)
-            self.url = url
-            self.current_item = None
-            self.save_item_key = None
-
-        def handle_starttag(self, tag, attrs):
-            """ Parser's start tag handler """
-            if self.current_item:
-                params = dict(attrs)
-                if tag == "a":
-                    link = params["href"]
-                    if link.startswith("index") and "title" in params:
-                        #description link
-                        self.current_item["name"] = params["title"][14:]
-                        self.current_item["desc_link"] = "/".join((self.url, link))
-                    elif link.startswith("download"):
-                        self.current_item["link"] = "/".join((self.url, link))
-                elif tag == "td":
-                    if "width" in params and params["width"] == "30" and not "leech" in self.current_item:
-                        self.save_item_key = "leech" if "seeds" in self.current_item else "seeds"
-
-            elif tag == "tr":
-                self.current_item = {}
-                self.current_item["size"] = ""
-                self.current_item["engine_url"] = self.url
-
-        def handle_endtag(self, tag):
-            """ Parser's end tag handler """
-            if self.current_item and tag == "tr":
-                if len(self.current_item) > 4:
-                    prettyPrinter(self.current_item)
-                self.current_item = None
-
-        def handle_data(self, data):
-            """ Parser's data handler """
-            if self.save_item_key:
-                self.current_item[self.save_item_key] = data.strip()
-                self.save_item_key = None
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        query = "".join((self.url, "/index.php?page=torrents&search=", what, "&category=", self.supported_categories.get(cat, '0'), "&active=1"))
-
-        get_table = re_compile('(?s)<table\sclass="lista".*>(.*)</table>')
-        data = get_table.search(retrieve_url(query)).group(0)
-        #extract first ten pages of next results
-        next_pages = re_compile('(?m)<option value="(.*)">[0-9]+</option>')
-        next_pages = ["".join((self.url, page)) for page in next_pages.findall(data)[:10]]
-
-        parser = self.MyHtmlParseWithBlackJack(self.url)
-        parser.feed(data)
-        parser.close()
-
-        for page in next_pages:
-            parser.feed(get_table.search(retrieve_url(page)).group(0))
-            parser.close()
diff --git a/src/searchengine/nova/engines/piratebay.png b/src/searchengine/nova/engines/piratebay.png
deleted file mode 100644
index 133c8c850e9da09c520c6d332ccdcd787338a215..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq000mG000mO00000I+&on0002pNkl<Z7*}KX
z4+Q^U0LW(e|NpwDqca#dIjsN-tY(0N5U{{{1_o9pVF6}lMusS;fbOOEO*d0FbudJN
z1=cZ`J&lxCSH9TB5DpfY!@$4~GJuzv!R!}QfI*&{L5-DxK^rJ=rEmr_gL#NFL%fY3
zgX6zH4Eq_H`j&26wQT8<wd*%NogU3l#o%b4(0B3o|Nrlg&TSTUVAz@Cu)JJ^LBvu~
z(l*jbOP%5Wa{&dX@YL?kAT8TGxx|AE|33>AeFXXN|HnfS3@3or{@MHHKNLLjybE#%
c5&-%i0P&KGd8gFZ@Bjb+07*qoM6N<$f&$ZdBme*a

diff --git a/src/searchengine/nova/engines/piratebay.py b/src/searchengine/nova/engines/piratebay.py
deleted file mode 100644
index ba047d1b8..000000000
--- a/src/searchengine/nova/engines/piratebay.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#VERSION: 2.15
-#AUTHORS: Fabien Devaux (fab@gnux.info)
-#CONTRIBUTORS: Christophe Dumez (chris@qbittorrent.org)
-#              Arthur (custparasite@gmx.se)
-#              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 HTMLParser import HTMLParser
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class piratebay(object):
-    """ Search engine class """
-    url = 'https://thepiratebay.org'
-    name = 'The Pirate Bay'
-    supported_categories = {'all': '0', 'music': '100', 'movies': '200', 'games': '400', 'software': '300'}
-
-    def download_torrent(self, info):
-        """ Downloader """
-        print(download_file(info))
-
-    class MyHtmlParseWithBlackJack(HTMLParser):
-        """ Parser class """
-        def __init__(self, list_searches, url):
-            HTMLParser.__init__(self)
-            self.list_searches = list_searches
-            self.url = url
-            self.current_item = None
-            self.save_item = None
-            self.result_table = False #table with results is found
-            self.result_tbody = False
-            self.add_query = True
-            self.result_query = False
-
-        def handle_start_tag_default(self, attrs):
-            """ Default handler for start tag dispatcher """
-            pass
-
-        def handle_start_tag_a(self, attrs):
-            """ Handler for start tag a """
-            params = dict(attrs)
-            link = params["href"]
-            if link.startswith("/torrent"):
-                self.current_item["desc_link"] = "".join((self.url, link))
-                self.save_item = "name"
-            elif link.startswith("magnet"):
-                self.current_item["link"] = link
-                # end of the 'name' item
-                self.current_item['name'] = self.current_item['name'].strip()
-                self.save_item = None
-
-        def handle_start_tag_font(self, attrs):
-            """ Handler for start tag font """
-            for attr in attrs:
-                if attr[1] == "detDesc":
-                    self.save_item = "size"
-                    break
-
-        def handle_start_tag_td(self, attrs):
-            """ Handler for start tag td """
-            for attr in attrs:
-                if attr[1] == "right":
-                    if "seeds" in self.current_item.keys():
-                        self.save_item = "leech"
-                    else:
-                        self.save_item = "seeds"
-                    break
-
-        def handle_starttag(self, tag, attrs):
-            """ Parser's start tag handler """
-            if self.current_item:
-                dispatcher = getattr(self, "_".join(("handle_start_tag", tag)), self.handle_start_tag_default)
-                dispatcher(attrs)
-
-            elif self.result_tbody:
-                if tag == "tr":
-                    self.current_item = {"engine_url" : self.url}
-
-            elif tag == "table":
-                self.result_table = "searchResult" == attrs[0][1]
-
-            elif self.add_query:
-                if self.result_query and tag == "a":
-                    if len(self.list_searches) < 10:
-                        self.list_searches.append(attrs[0][1])
-                    else:
-                        self.add_query = False
-                        self.result_query = False
-                elif tag == "div":
-                    self.result_query = "center" == attrs[0][1]
-
-        def handle_endtag(self, tag):
-            """ Parser's end tag handler """
-            if self.result_tbody:
-                if tag == "tr":
-                    prettyPrinter(self.current_item)
-                    self.current_item = None
-                elif tag == "font":
-                    self.save_item = None
-                elif tag == "table":
-                    self.result_table = self.result_tbody = False
-
-            elif self.result_table:
-                if tag == "thead":
-                    self.result_tbody = True
-                elif tag == "table":
-                    self.result_table = self.result_tbody = False
-
-            elif self.add_query and self.result_query:
-                if tag == "div":
-                    self.add_query = self.result_query = False
-
-        def handle_data(self, data):
-            """ Parser's data handler """
-            if self.save_item:
-                if self.save_item == "size":
-                    temp_data = data.split()
-                    if "Size" in temp_data:
-                        indx = temp_data.index("Size")
-                        self.current_item[self.save_item] = temp_data[indx + 1] + " " + temp_data[indx + 2]
-
-                elif self.save_item == "name":
-                    # names with special characters like '&' are splitted in several pieces
-                    if 'name' not in self.current_item:
-                        self.current_item['name'] = ''
-                    self.current_item['name'] += data
-
-                else:
-                    self.current_item[self.save_item] = data
-                    self.save_item = None
-
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        #prepare query. 7 is filtering by seeders
-        cat = cat.lower()
-        query = "/".join((self.url, "search", what, "0", "7", self.supported_categories[cat]))
-
-        response = retrieve_url(query)
-
-        list_searches = []
-        parser = self.MyHtmlParseWithBlackJack(list_searches, self.url)
-        parser.feed(response)
-        parser.close()
-
-        parser.add_query = False
-        for search_query in list_searches:
-            response = retrieve_url(self.url + search_query)
-            parser.feed(response)
-            parser.close()
-
-        return
diff --git a/src/searchengine/nova/engines/torlock.png b/src/searchengine/nova/engines/torlock.png
deleted file mode 100644
index c6ee6a55b006d986435105f885e7dc4a91742214..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0p>|WK~y-)t&&Yh6k!<0f6wf=EW0iiWD!Ahu<+}$+93k#Qs7(BCFtxx
zK}Qcl&_G}|fk+Z06%|c~)NWZ&(-(a}c1w$*T8gcx2wBjL#X)qor^^_zm)hueecu27
zeLnt(dpRMlU&lXU11%t1#P#RH>4T}1Mo%Q*-QOBmpv~&_T-;rH-j~i@*!4QKwrjbl
z-H00OKXnj_>yN%zoc(mD_+V!tx%w`ALk%l|USLiQ3XDiVrP@Hm_4ffEfRBxf-=EIa
zW#%KXxBi%NZib{yCJ2|*&;hgp&wvClBLT&D1PrhPxL!;)oQ)*$W_$T<;Zc3_L?#HA
z;*TQW6tD-_2Ha3X@A3#~V6%Eo7l63_vG#?p*Cy+mM#MdQr84D+!kECA1PsN7XVh?2
z4LOk`mwZHKfQJI>6|(9%!*}+#jW1ZqFMCVVvk0xgaS6!(TCkxBa4ba9wpPvqd4&n}
zoMC|OjeVzYHRMV_hr+qv#W7`Ioekt8Nm%MRg{lW_Wh?m#NDH(8lU4Oqz<UcA1qQ|S
z8{-|=;`*IH&*SW-dn%j+4yd714T-q@HNXjATw+l>&<|_?6u1v~>N(|DumU(5U!Vef
z2Kpu7WlgzPgQJFlswme)7D!b`xfX86CjXD0Q-7-st*MN500000NkvXXu0mjfG-Uu@

diff --git a/src/searchengine/nova/engines/torlock.py b/src/searchengine/nova/engines/torlock.py
deleted file mode 100644
index f154bf032..000000000
--- a/src/searchengine/nova/engines/torlock.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#VERSION: 2.0
-#AUTHORS: Douman (custparasite@gmx.se)
-#CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es)
-
-from novaprinter import prettyPrinter
-from helpers import retrieve_url, download_file
-from re import compile as re_compile
-from HTMLParser import HTMLParser
-
-class torlock(object):
-    url = "https://www.torlock.com"
-    name = "TorLock"
-    supported_categories = {'all'      : 'all',
-                            'anime'    : 'anime',
-                            'software' : 'software',
-                            'games'    : 'game',
-                            'movies'   : 'movie',
-                            'music'    : 'music',
-                            'tv'       : 'television',
-                            'books'    : 'ebooks'}
-
-    def download_torrent(self, info):
-        print(download_file(info))
-
-    class MyHtmlParser(HTMLParser):
-        """ Sub-class for parsing results """
-        def __init__(self, url):
-            HTMLParser.__init__(self)
-            self.url = url
-            self.article_found = False #true when <article> with results is found
-            self.item_found = False
-            self.item_bad = False #set to True for malicious links
-            self.current_item = None #dict for found item
-            self.item_name = None #key's name in current_item dict
-            self.parser_class = {"ts"  : "size",
-                                 "tul" : "seeds",
-                                 "tdl" : "leech"}
-
-        def handle_starttag(self, tag, attrs):
-            params = dict(attrs)
-            if self.item_found:
-                if tag == "td":
-                    if "class" in params:
-                        self.item_name = self.parser_class.get(params["class"], None)
-                        if self.item_name:
-                            self.current_item[self.item_name] = ""
-
-            elif self.article_found and tag == "a":
-                if "href" in params:
-                    link = params["href"]
-                    if link.startswith("/torrent"):
-                        self.current_item["desc_link"] = "".join((self.url, link))
-                        self.current_item["link"] = "".join((self.url, "/tor/", link.split('/')[2], ".torrent"))
-                        self.current_item["engine_url"] = self.url
-                        self.item_found = True
-                        self.item_name = "name"
-                        self.current_item["name"] = ""
-                        self.item_bad = "rel" in params and params["rel"] == "nofollow"
-
-            elif tag == "article":
-                self.article_found = True
-                self.current_item = {}
-
-        def handle_data(self, data):
-            if self.item_name:
-                self.current_item[self.item_name] += data
-
-        def handle_endtag(self, tag):
-            if tag == "article":
-                self.article_found = False
-            elif self.item_name and (tag == "a" or tag == "td"):
-                self.item_name = None
-            elif self.item_found and tag == "tr":
-                self.item_found = False
-                if not self.item_bad:
-                    prettyPrinter(self.current_item)
-                self.current_item = {}
-
-    def search(self, query, cat='all'):
-        """ Performs search """
-        query = query.replace("%20", "-")
-
-        parser = self.MyHtmlParser(self.url)
-        page = "".join((self.url, "/", self.supported_categories[cat], "/torrents/", query, ".html?sort=seeds&page=1"))
-        html = retrieve_url(page)
-        parser.feed(html)
-
-        counter = 1
-        additional_pages = re_compile("/{0}/torrents/{1}.html\?sort=seeds&page=[0-9]+".format(self.supported_categories[cat], query))
-        list_searches = additional_pages.findall(html)[:-1] #last link is next(i.e. second)
-        for page in map(lambda link: "".join((self.url, link)), list_searches):
-            html = retrieve_url(page)
-            parser.feed(html)
-            counter += 1
-            if counter > 3:
-                break
-        parser.close()
diff --git a/src/searchengine/nova/engines/torrentz.png b/src/searchengine/nova/engines/torrentz.png
deleted file mode 100644
index aa17da22c1dfca17c64d30accee3c92cfcc88d74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E08u$n`vpsdK}1NED7=p
zW^j0RBMrz=@^o<w;fPLNvp)ULc?PGmWj$xAH!ig9IrCd`Cclx9JnJS#ht0fF<+~P5
Q1*&H7boFyt=akR{05o$Tt^fc4

diff --git a/src/searchengine/nova/engines/torrentz.py b/src/searchengine/nova/engines/torrentz.py
deleted file mode 100644
index 9399cdcf6..000000000
--- a/src/searchengine/nova/engines/torrentz.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#VERSION: 2.22
-#AUTHORS: 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
-from HTMLParser import HTMLParser
-from urllib import urlencode
-
-class torrentz(object):
-    # mandatory properties
-    url  = 'https://torrentz2.eu'
-    name = 'Torrentz2'
-    supported_categories = {'all': ''}
-
-    trackers_list = ['udp://tracker.coppersurfer.tk:6969/announce',
-                    'udp://tracker.opentrackr.org:1337/announce',
-                    'udp://tracker.zer0day.to:1337/announce',
-                    'udp://tracker.leechers-paradise.org:6969/announce',
-                    'udp://9.rarbg.com:2710/announce',
-                    'udp://explodie.org:6969/announce']
-
-    class MyHtmlParser(HTMLParser):
-        def __init__(self, results, url, trackers):
-            HTMLParser.__init__(self)
-            self.results = results
-            self.url = url
-            self.trackers = trackers
-            self.td_counter = None
-            self.current_item = None
-
-        def handle_starttag(self, tag, attrs):
-            params = dict(attrs)
-            if tag == 'a':
-                if 'href' in params:
-                    self.current_item = {}
-                    self.td_counter = 0
-                    self.current_item['link'] = 'magnet:?xt=urn:btih:' + \
-                        params['href'].strip(' /') + self.trackers
-                    self.current_item['desc_link'] = self.url + params['href'].strip()
-            elif tag == 'span':
-                if self.td_counter is not None:
-                    self.td_counter += 1
-                    if self.td_counter > 5: # safety
-                        self.td_counter = None
-
-        def handle_data(self, data):
-            if self.td_counter == 0:
-                if 'name' not in self.current_item:
-                    self.current_item['name'] = ''
-                self.current_item['name'] += data
-            elif self.td_counter == 3:
-                if 'size' not in self.current_item:
-                    self.current_item['size'] = data.strip()
-                    if self.current_item['size'] == 'Pending':
-                        self.current_item['size'] = ''
-            elif self.td_counter == 4:
-                if 'seeds' not in self.current_item:
-                    self.current_item['seeds'] = data.strip().replace(',', '')
-                    if not self.current_item['seeds'].isdigit():
-                        self.current_item['seeds'] = 0
-            elif self.td_counter == 5:
-                if 'leech' not in self.current_item:
-                    self.current_item['leech'] = data.strip().replace(',', '')
-                    if not self.current_item['leech'].isdigit():
-                        self.current_item['leech'] = 0
-
-                # display item
-                self.td_counter = None
-                self.current_item['engine_url'] = self.url
-                if self.current_item['name'].find(u' \xbb'):
-                    self.current_item['name'] = self.current_item['name'].split(u' \xbb')[0]
-                self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name'].encode('utf-8')})
-
-                prettyPrinter(self.current_item)
-                self.results.append('a')
-
-    def download_torrent(self, info):
-        print(download_file(info))
-
-    def search(self, what, cat='all'):
-        # initialize trackers for magnet links
-        trackers = '&' + '&'.join(urlencode({'tr' : tracker}) for tracker in self.trackers_list)
-
-        results_list = []
-        parser = self.MyHtmlParser(results_list, self.url, trackers)
-        i = 0
-        while i < 6:
-            # "what" is already urlencoded
-            html = retrieve_url(self.url + '/search?f=%s&p=%d' % (what, i))
-            parser.feed(html)
-            if len(results_list) < 1:
-                break
-            del results_list[:]
-            i += 1
-        parser.close()
diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt
deleted file mode 100644
index 2027c36e0..000000000
--- a/src/searchengine/nova/engines/versions.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-btdb: 1.01
-demonoid: 1.23
-legittorrents: 2.02
-piratebay: 2.15
-torlock: 2.0
-torrentz: 2.22
diff --git a/src/searchengine/nova3/engines/__init__.py b/src/searchengine/nova3/engines/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/searchengine/nova3/engines/btdb.png b/src/searchengine/nova3/engines/btdb.png
deleted file mode 100644
index b63314b9ddd57f2c1da6902082cddf758e9f43a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;RF;E1sy(Vm%ji20l!H^
zK~y-)os%((8bKI_pIH}Fbiu|Pw?!l?9B8gkh}f)!XK__JQyf=_q{=T4dkOgs78Zg@
z5eq>O0%B(?1kOgd4cQ`%#TF}sU3Z-n*$YVs<n*bgnCBg4=6eNykvEJ>gt!G>NhzNJ
z2qC@zACYo&Z&`Q0?-vh?=NA|1_aOKHyaeL>8xNQ!RrO}Q*#y4=BKZ?=#p75cRrPwk
z*#rtebn;_mfUC$s<PGC8rmCNV;AhwocmiH1PtMNXoFD_l5#m-93WaZ`X`Z)QEnL@S
zI2_V$w@IhdOePbW%_ffHFdmOF41;R5itD;`yIr~8?`_5NymMXG(RH12xlBABXEvLW
zNF<og=NN`Tuh*l~=}@Uu$Ye4!8Vxi}JA`5QREhqX?RLv*wW40H<2Vk!@3Y(O5JI3R
z3Wvi1Aq2K<V_6opTFnPUESt@~PNh<*VzH>WuFGIBAPhq^O=G!SVwxtUQi*=QkL$YR
zaye|<W;7bbeBb{n^7;H*DP{MBM??tmPC?4|(S#j~hm<2Fn(gTc0n>ZSx>Ep>s(J$~
zj*u6Tg95PLY=We!UIXL*T*m{(4?Xy!ji=W62TUuy?ID8`aR2}S07*qoM6N<$f>+Py
Ax&QzG

diff --git a/src/searchengine/nova3/engines/btdb.py b/src/searchengine/nova3/engines/btdb.py
deleted file mode 100644
index 555850af4..000000000
--- a/src/searchengine/nova3/engines/btdb.py
+++ /dev/null
@@ -1,147 +0,0 @@
-#VERSION: 1.01
-#AUTHORS: Charles Worthing
-#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 html.parser import HTMLParser
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class btdb(object):
-    """ Search engine class """
-    url = 'https://btdb.in'
-    name = 'BTDB'
-
-    def download_torrent(self, info):
-        """ Downloader """
-        print(download_file(info))
-
-    class MyHtmlParser(HTMLParser):
-        """ Parser class """
-        def __init__(self, results, url):
-            HTMLParser.__init__(self)
-            self.results = results
-            self.url = url
-            self.current_item = {} # One torrent result
-            self.add_query = True
-            self.torrent_info_index = 0 # Count of the meta data encountered
-            self.torrent_info_array = []
-            self.meta_data_grabbing = 0
-            self.meta_data_array = []
-            self.torrent_no_files = 0
-            self.torrent_date_added = 0
-            self.torrent_popularity = 0
-            self.mangnet_link = ""
-            self.desc_link = ""
-            self.torrent_name = ""
-
-        def handle_starttag(self, tag, attrs):
-            if tag == "span":
-                span_dict = dict(attrs)
-                if "class" in span_dict:
-                    the_class = span_dict["class"]
-                    if the_class == "item-meta-info-value":
-                        self.meta_data_grabbing += 1
-                    else:
-                        self.meta_data_grabbing = 0
-            if tag == "script":
-                return
-            if tag == "li":
-                for attr in attrs:
-                    if attr[1] == "search-ret-item":
-                        self.torrent_info_index = 1
-            if tag == "a":
-                if self.torrent_info_index > 0:
-                    params = dict(attrs)
-                    if "href" in params:
-                        link = params["href"]
-                        if link.startswith("/torrent"):
-                            self.desc_link = "".join((self.url, link))
-                            self.torrent_name = params["title"]
-                        if link.startswith("magnet:"):
-                            self.mangnet_link = link
-
-        def handle_endtag(self, tag): 
-            if tag == "script":
-                return
-            if tag == "div":
-                if self.meta_data_grabbing > 0:
-                    
-                    self.torrent_no_files = self.meta_data_array[2] # Not used
-                    self.torrent_date_added = self.meta_data_array[4] # Not used
-                    self.torrent_popularity = self.meta_data_array[6] # Not used
-
-                    self.current_item["size"] = self.meta_data_array[0]
-                    self.current_item["name"] = self.torrent_name
-                    self.current_item["engine_url"] = self.url
-                    self.current_item["link"] = self.mangnet_link
-                    self.current_item["desc_link"] = self.desc_link
-                    self.current_item["seeds"] = -1
-                    self.current_item["leech"] = -1
-
-                    prettyPrinter(self.current_item)
-                    self.results.append('a')
-                    self.current_item = {}
-
-                    self.meta_data_grabbing = 0
-                    self.meta_data_array = []
-                    self.mangnet_link = ""
-                    self.desc_link = ""
-                    self.torrent_name = ""
-
-        def handle_data(self, data):
-            if self.torrent_info_index > 0:
-                self.torrent_info_array.append(data)
-                self.torrent_info_index += 1
-            if self.meta_data_grabbing > 0:
-                self.meta_data_array.append(data)
-                self.meta_data_grabbing += 1
-
-        def handle_entityref(self, name):
-            c = unichr(name2codepoint[name])
-
-        def handle_charref(self, name):
-            if name.startswith('x'):
-                c = unichr(int(name[1:], 16))
-            else:
-                c = unichr(int(name))
-
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        results_list = []
-        parser = self.MyHtmlParser(results_list, self.url)
-        i = 1
-        while i < 31:
-            # "what" is already urlencoded
-            html = retrieve_url(self.url + '/q/%s/%d?sort=popular' % (what, i))
-            parser.feed(html)
-            if len(results_list) < 1:
-                break
-            del results_list[:]
-            i += 1
-        parser.close()
diff --git a/src/searchengine/nova3/engines/demonoid.png b/src/searchengine/nova3/engines/demonoid.png
deleted file mode 100644
index 71eb564420cc35634786d17ce137c308d33a0fd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00KivL_t(I%f*w=OB8V!#y{WP*>QiE
zxw|cC2)ZRGSx6Rv7!?x*(V-x^cF0RXmo8CI(6tCUdNPRa_7^x_3e!vB+Ll`6x@xjE
zy1&NRnQ`XZK~^a;y!D<Q-k0~`<$0e6{%2{LCPf|8o4T%xy)4$TQU`Y*NAaWtc80sv
z;C&Zx7=9MpAuv`w(w&VwdJ$!Dp-RV*IH6Dg&-VdI$*?gDo8|;qmd*FCH6TWyPEab^
zhyd6%$)}GcjMW;BBe6^$%k+svRmw$&h4}*ENCPuj16|j}Hi1(MA*Cb`5L~|2PCOaL
zu_f=umhpU#P0yn(?bC9onW|Z&kdOVYflxL;HW5^O3Wasdsz*ps={}ZZeKkm>x=1AE
zp@dvQ!6q!{2b!kIpr&c^_QM7`4#&vNm&i;CRQD2{tv8sO+~mT*J-XYkGn)zXcJwDg
zMA>i_IDOV<YCN%Z!SYg>=?{&l?m7BToZ;lDUQ($f<#Gi@QAi}4X*t-+)hjnirP_G<
z`~kh^vs;(f|2lZ<4t;&c2}c{SHY`+C#dTdOl?w5AoP0h{B9S1Mo2OVbdG&e-e0A#!
zx~_}imqXNSht`%h=H}*DSy`d0s|(XK$!4?k^z`7mKE+~%a@hc1Mb~u^tc#dVr=R4O
z$7$RLW1|!7Z#qCM+Qj>b3BG)uArOG<>=+{>Z<x-^Y&%x`Y0>_R7M?5<4Ep#|B7K4F
zlrYxTD6LB>O9Q{zUHr@E>7xeWa0JJ#@hy}1YgWWwL$h1RegVC73D~!lN%;T(002ov
JPDHLkV1joxH%<Tm

diff --git a/src/searchengine/nova3/engines/demonoid.py b/src/searchengine/nova3/engines/demonoid.py
deleted file mode 100644
index 1372ac9dd..000000000
--- a/src/searchengine/nova3/engines/demonoid.py
+++ /dev/null
@@ -1,144 +0,0 @@
-#VERSION: 1.23
-#AUTHORS: Douman (custparasite@gmx.se)
-#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 html.parser import HTMLParser
-from re import compile as re_compile
-from re import DOTALL
-from itertools import islice
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class demonoid(object):
-    """ Search engine class """
-    url = "https://www.demonoid.pw"
-    name = "Demonoid"
-    supported_categories = {'all': '0',
-                            'music': '2',
-                            'movies': '1',
-                            'games': '4',
-                            'software': '5',
-                            'books': '11',
-                            'anime': '9',
-                            'tv': '3'}
-
-    def download_torrent(self, info):
-        """ Downloader """
-        print(download_file(info))
-
-    class MyHtmlParseWithBlackJack(HTMLParser):
-        """ Parser class """
-        def __init__(self, url):
-            HTMLParser.__init__(self)
-            self.url = url
-            self.current_item = None
-            self.save_data = None
-            self.seeds_leech = False
-            self.size_repl = re_compile(",")
-
-        def handle_starttag(self, tag, attrs):
-            """ Parser's start tag handler """
-            if tag == "a":
-                params = dict(attrs)
-                if "href" in params:
-                    link = params["href"]
-                    if link.startswith("/files/details"):
-                        self.current_item = dict()
-                        self.current_item["desc_link"] = "".join((self.url, link))
-                        self.current_item["engine_url"] = self.url
-                        self.save_data = "name"
-                    elif link.startswith("/files/download"):
-                        self.current_item["link"] = "".join((self.url, link))
-
-            elif self.current_item:
-                if tag == "td":
-                    params = dict(attrs)
-                    if "class" in params and "align" in params:
-                        if params["class"].startswith("tone"):
-                            if params["align"] == "right":
-                                self.save_data = "size"
-                            elif params["align"] == "center":
-                                self.seeds_leech = True
-
-                elif self.seeds_leech and tag == "font":
-                    for attr in attrs:
-                        if "class" in attr:
-                            if attr[1] == "green":
-                                self.save_data = "seeds"
-                            elif attr[1] == "red":
-                                self.save_data = "leech"
-
-                    self.seeds_leech = False
-
-
-        def handle_data(self, data):
-            """ Parser's data handler """
-            if self.save_data:
-                if self.save_data == "name":
-                    # names with special characters like '&' are splitted in several pieces
-                    if 'name' not in self.current_item:
-                        self.current_item['name'] = ''
-                    self.current_item['name'] += data
-                else:
-                    self.current_item[self.save_data] = data
-                    self.save_data = None
-                if self.current_item.__len__() == 7:
-                    self.current_item["size"] = self.size_repl.sub("", self.current_item["size"])
-                    prettyPrinter(self.current_item)
-                    self.current_item = None
-
-        def handle_endtag(self, tag):
-            """ Parser's end tag handler """
-            if self.save_data == "name":
-                self.save_data = None
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        #prepare query
-        cat = self.supported_categories[cat.lower()]
-        query = "".join((self.url, "/files/?category=", cat, "&subcategory=All&quality=All&seeded=2&external=2&query=", what, "&uid=0&sort=S"))
-
-        data = retrieve_url(query)
-
-        add_res_list = re_compile("/files.*page=[0-9]+")
-        torrent_list = re_compile("start torrent list -->(.*)<!-- end torrent", DOTALL)
-        data = torrent_list.search(data).group(0)
-        list_results = add_res_list.findall(data)
-
-        parser = self.MyHtmlParseWithBlackJack(self.url)
-        parser.feed(data)
-
-        del data
-
-        if list_results:
-            for search_query in islice((add_res_list.search(result).group(0) for result in list_results[1].split(" | ")), 0, 5):
-                response = retrieve_url(self.url + search_query)
-                parser.feed(torrent_list.search(response).group(0))
-                parser.close()
-
-        return
diff --git a/src/searchengine/nova3/engines/legittorrents.png b/src/searchengine/nova3/engines/legittorrents.png
deleted file mode 100644
index eb8f33d7126faa334ebc077305cc29d17a75d0b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002tP)t-s|NsB|
z{QUa*`ttJf`1tsP+!}Sx4f^`}@bK`n&ynit>T}EsaLEXP+8BG(6M4}Pe%BRk#s!Ao
z9f;u{Ys3SPzgX<-?3>GBw9u1?+9=xE+Q8VN=<DUB&2`}5;EdBblh;Jc;;*sUf~2yP
zi_$o-*ny<6l!w(RuGWB~v6RKox2@HFqp_2-(2}gweWS3G$;-y8(tM(@lCR))qRMmG
z+1U2>_M)$ngv~8@yeNylPL07(pv!LJ>Du)4^sTv|m!*fb*p1rT+MvRCkH1!>vXzp-
zTBFQ#=j`J2^z`=j_C8z=JOBUyOLS6BQvd)13I+ZB0St8#{r&y@{r&y@{r#m8s&eon
zV;GVh+Rs&nYTJft>xODchH7+%YBh#xmy9I`YUkOpu8|`LU3hRJg{Eqxi5dw8Jbp*d
z0001&Nkl<ZcwSY^)e^!m5QfogDhXAA7I$}dcX|H@0+K01zPmj$|009{%Pb6t1wktj
z`P5BkxZpuD${S+_WE!t5Jg=TF6bYZmTI!%E*_<W=;(>HE%@Y5~lgf@$#pn-ememlT
zY1?f9I;z?eps(vg0Y-)~(dZ0*Fn8VMYQ5QpvfIa4#}LTreDVF;{Sg9?C#6(+eeX9C
Wunh6r;TL590000<MNUMnLSTZvnHClR

diff --git a/src/searchengine/nova3/engines/legittorrents.py b/src/searchengine/nova3/engines/legittorrents.py
deleted file mode 100644
index 16095c72f..000000000
--- a/src/searchengine/nova3/engines/legittorrents.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#VERSION: 2.02
-#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
-#         Douman (custparasite@gmx.se)
-
-# 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
-from html.parser import HTMLParser
-from re import compile as re_compile
-
-class legittorrents(object):
-    url = 'http://www.legittorrents.info'
-    name = 'Legit Torrents'
-    supported_categories = {'all': '0', 'movies': '1', 'tv': '13', 'music': '2', 'games': '3', 'anime': '5', 'books': '6'}
-
-    def download_torrent(self, info):
-        print(download_file(info))
-
-    class MyHtmlParseWithBlackJack(HTMLParser):
-        """ Parser class """
-        def __init__(self, url):
-            HTMLParser.__init__(self)
-            self.url = url
-            self.current_item = None
-            self.save_item_key = None
-
-        def handle_starttag(self, tag, attrs):
-            """ Parser's start tag handler """
-            if self.current_item:
-                params = dict(attrs)
-                if tag == "a":
-                    link = params["href"]
-                    if link.startswith("index") and "title" in params:
-                        #description link
-                        self.current_item["name"] = params["title"][14:]
-                        self.current_item["desc_link"] = "/".join((self.url, link))
-                    elif link.startswith("download"):
-                        self.current_item["link"] = "/".join((self.url, link))
-                elif tag == "td":
-                    if "width" in params and params["width"] == "30" and not "leech" in self.current_item:
-                        self.save_item_key = "leech" if "seeds" in self.current_item else "seeds"
-
-            elif tag == "tr":
-                self.current_item = {}
-                self.current_item["size"] = ""
-                self.current_item["engine_url"] = self.url
-
-        def handle_endtag(self, tag):
-            """ Parser's end tag handler """
-            if self.current_item and tag == "tr":
-                if len(self.current_item) > 4:
-                    prettyPrinter(self.current_item)
-                self.current_item = None
-
-        def handle_data(self, data):
-            """ Parser's data handler """
-            if self.save_item_key:
-                self.current_item[self.save_item_key] = data.strip()
-                self.save_item_key = None
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        query = "".join((self.url, "/index.php?page=torrents&search=", what, "&category=", self.supported_categories.get(cat, '0'), "&active=1"))
-
-        get_table = re_compile('(?s)<table\sclass="lista".*>(.*)</table>')
-        data = get_table.search(retrieve_url(query)).group(0)
-        #extract first ten pages of next results
-        next_pages = re_compile('(?m)<option value="(.*)">[0-9]+</option>')
-        next_pages = ["".join((self.url, page)) for page in next_pages.findall(data)[:10]]
-
-        parser = self.MyHtmlParseWithBlackJack(self.url)
-        parser.feed(data)
-        parser.close()
-
-        for page in next_pages:
-            parser.feed(get_table.search(retrieve_url(page)).group(0))
-            parser.close()
diff --git a/src/searchengine/nova3/engines/piratebay.png b/src/searchengine/nova3/engines/piratebay.png
deleted file mode 100644
index 133c8c850e9da09c520c6d332ccdcd787338a215..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq000mG000mO00000I+&on0002pNkl<Z7*}KX
z4+Q^U0LW(e|NpwDqca#dIjsN-tY(0N5U{{{1_o9pVF6}lMusS;fbOOEO*d0FbudJN
z1=cZ`J&lxCSH9TB5DpfY!@$4~GJuzv!R!}QfI*&{L5-DxK^rJ=rEmr_gL#NFL%fY3
zgX6zH4Eq_H`j&26wQT8<wd*%NogU3l#o%b4(0B3o|Nrlg&TSTUVAz@Cu)JJ^LBvu~
z(l*jbOP%5Wa{&dX@YL?kAT8TGxx|AE|33>AeFXXN|HnfS3@3or{@MHHKNLLjybE#%
c5&-%i0P&KGd8gFZ@Bjb+07*qoM6N<$f&$ZdBme*a

diff --git a/src/searchengine/nova3/engines/piratebay.py b/src/searchengine/nova3/engines/piratebay.py
deleted file mode 100644
index 3beab988b..000000000
--- a/src/searchengine/nova3/engines/piratebay.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#VERSION: 2.15
-#AUTHORS: Fabien Devaux (fab@gnux.info)
-#CONTRIBUTORS: Christophe Dumez (chris@qbittorrent.org)
-#              Arthur (custparasite@gmx.se)
-#              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 html.parser import HTMLParser
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class piratebay(object):
-    """ Search engine class """
-    url = 'https://thepiratebay.org'
-    name = 'The Pirate Bay'
-    supported_categories = {'all': '0', 'music': '100', 'movies': '200', 'games': '400', 'software': '300'}
-
-    def download_torrent(self, info):
-        """ Downloader """
-        print(download_file(info))
-
-    class MyHtmlParseWithBlackJack(HTMLParser):
-        """ Parser class """
-        def __init__(self, list_searches, url):
-            HTMLParser.__init__(self)
-            self.list_searches = list_searches
-            self.url = url
-            self.current_item = None
-            self.save_item = None
-            self.result_table = False #table with results is found
-            self.result_tbody = False
-            self.add_query = True
-            self.result_query = False
-
-        def handle_start_tag_default(self, attrs):
-            """ Default handler for start tag dispatcher """
-            pass
-
-        def handle_start_tag_a(self, attrs):
-            """ Handler for start tag a """
-            params = dict(attrs)
-            link = params["href"]
-            if link.startswith("/torrent"):
-                self.current_item["desc_link"] = "".join((self.url, link))
-                self.save_item = "name"
-            elif link.startswith("magnet"):
-                self.current_item["link"] = link
-                # end of the 'name' item
-                self.current_item['name'] = self.current_item['name'].strip()
-                self.save_item = None
-
-        def handle_start_tag_font(self, attrs):
-            """ Handler for start tag font """
-            for attr in attrs:
-                if attr[1] == "detDesc":
-                    self.save_item = "size"
-                    break
-
-        def handle_start_tag_td(self, attrs):
-            """ Handler for start tag td """
-            for attr in attrs:
-                if attr[1] == "right":
-                    if "seeds" in self.current_item.keys():
-                        self.save_item = "leech"
-                    else:
-                        self.save_item = "seeds"
-                    break
-
-        def handle_starttag(self, tag, attrs):
-            """ Parser's start tag handler """
-            if self.current_item:
-                dispatcher = getattr(self, "_".join(("handle_start_tag", tag)), self.handle_start_tag_default)
-                dispatcher(attrs)
-
-            elif self.result_tbody:
-                if tag == "tr":
-                    self.current_item = {"engine_url" : self.url}
-
-            elif tag == "table":
-                self.result_table = "searchResult" == attrs[0][1]
-
-            elif self.add_query:
-                if self.result_query and tag == "a":
-                    if len(self.list_searches) < 10:
-                        self.list_searches.append(attrs[0][1])
-                    else:
-                        self.add_query = False
-                        self.result_query = False
-                elif tag == "div":
-                    self.result_query = "center" == attrs[0][1]
-
-        def handle_endtag(self, tag):
-            """ Parser's end tag handler """
-            if self.result_tbody:
-                if tag == "tr":
-                    prettyPrinter(self.current_item)
-                    self.current_item = None
-                elif tag == "font":
-                    self.save_item = None
-                elif tag == "table":
-                    self.result_table = self.result_tbody = False
-
-            elif self.result_table:
-                if tag == "thead":
-                    self.result_tbody = True
-                elif tag == "table":
-                    self.result_table = self.result_tbody = False
-
-            elif self.add_query and self.result_query:
-                if tag == "div":
-                    self.add_query = self.result_query = False
-
-        def handle_data(self, data):
-            """ Parser's data handler """
-            if self.save_item:
-                if self.save_item == "size":
-                    temp_data = data.split()
-                    if "Size" in temp_data:
-                        indx = temp_data.index("Size")
-                        self.current_item[self.save_item] = temp_data[indx + 1] + " " + temp_data[indx + 2]
-
-                elif self.save_item == "name":
-                    # names with special characters like '&' are splitted in several pieces
-                    if 'name' not in self.current_item:
-                        self.current_item['name'] = ''
-                    self.current_item['name'] += data
-
-                else:
-                    self.current_item[self.save_item] = data
-                    self.save_item = None
-
-
-    def search(self, what, cat='all'):
-        """ Performs search """
-        #prepare query. 7 is filtering by seeders
-        cat = cat.lower()
-        query = "/".join((self.url, "search", what, "0", "7", self.supported_categories[cat]))
-
-        response = retrieve_url(query)
-
-        list_searches = []
-        parser = self.MyHtmlParseWithBlackJack(list_searches, self.url)
-        parser.feed(response)
-        parser.close()
-
-        parser.add_query = False
-        for search_query in list_searches:
-            response = retrieve_url(self.url + search_query)
-            parser.feed(response)
-            parser.close()
-
-        return
diff --git a/src/searchengine/nova3/engines/torlock.png b/src/searchengine/nova3/engines/torlock.png
deleted file mode 100644
index c6ee6a55b006d986435105f885e7dc4a91742214..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0p>|WK~y-)t&&Yh6k!<0f6wf=EW0iiWD!Ahu<+}$+93k#Qs7(BCFtxx
zK}Qcl&_G}|fk+Z06%|c~)NWZ&(-(a}c1w$*T8gcx2wBjL#X)qor^^_zm)hueecu27
zeLnt(dpRMlU&lXU11%t1#P#RH>4T}1Mo%Q*-QOBmpv~&_T-;rH-j~i@*!4QKwrjbl
z-H00OKXnj_>yN%zoc(mD_+V!tx%w`ALk%l|USLiQ3XDiVrP@Hm_4ffEfRBxf-=EIa
zW#%KXxBi%NZib{yCJ2|*&;hgp&wvClBLT&D1PrhPxL!;)oQ)*$W_$T<;Zc3_L?#HA
z;*TQW6tD-_2Ha3X@A3#~V6%Eo7l63_vG#?p*Cy+mM#MdQr84D+!kECA1PsN7XVh?2
z4LOk`mwZHKfQJI>6|(9%!*}+#jW1ZqFMCVVvk0xgaS6!(TCkxBa4ba9wpPvqd4&n}
zoMC|OjeVzYHRMV_hr+qv#W7`Ioekt8Nm%MRg{lW_Wh?m#NDH(8lU4Oqz<UcA1qQ|S
z8{-|=;`*IH&*SW-dn%j+4yd714T-q@HNXjATw+l>&<|_?6u1v~>N(|DumU(5U!Vef
z2Kpu7WlgzPgQJFlswme)7D!b`xfX86CjXD0Q-7-st*MN500000NkvXXu0mjfG-Uu@

diff --git a/src/searchengine/nova3/engines/torlock.py b/src/searchengine/nova3/engines/torlock.py
deleted file mode 100644
index a1afbf121..000000000
--- a/src/searchengine/nova3/engines/torlock.py
+++ /dev/null
@@ -1,97 +0,0 @@
-#VERSION: 2.0
-#AUTHORS: Douman (custparasite@gmx.se)
-#CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es)
-
-from novaprinter import prettyPrinter
-from helpers import retrieve_url, download_file
-from re import compile as re_compile
-from html.parser import HTMLParser
-
-class torlock(object):
-    url = "https://www.torlock.com"
-    name = "TorLock"
-    supported_categories = {'all'      : 'all',
-                            'anime'    : 'anime',
-                            'software' : 'software',
-                            'games'    : 'game',
-                            'movies'   : 'movie',
-                            'music'    : 'music',
-                            'tv'       : 'television',
-                            'books'    : 'ebooks'}
-
-    def download_torrent(self, info):
-        print(download_file(info))
-
-    class MyHtmlParser(HTMLParser):
-        """ Sub-class for parsing results """
-        def __init__(self, url):
-            HTMLParser.__init__(self)
-            self.url = url
-            self.article_found = False #true when <article> with results is found
-            self.item_found = False
-            self.item_bad = False #set to True for malicious links
-            self.current_item = None #dict for found item
-            self.item_name = None #key's name in current_item dict
-            self.parser_class = {"ts"  : "size",
-                                 "tul" : "seeds",
-                                 "tdl" : "leech"}
-
-        def handle_starttag(self, tag, attrs):
-            params = dict(attrs)
-            if self.item_found:
-                if tag == "td":
-                    if "class" in params:
-                        self.item_name = self.parser_class.get(params["class"], None)
-                        if self.item_name:
-                            self.current_item[self.item_name] = ""
-
-            elif self.article_found and tag == "a":
-                if "href" in params:
-                    link = params["href"]
-                    if link.startswith("/torrent"):
-                        self.current_item["desc_link"] = "".join((self.url, link))
-                        self.current_item["link"] = "".join((self.url, "/tor/", link.split('/')[2], ".torrent"))
-                        self.current_item["engine_url"] = self.url
-                        self.item_found = True
-                        self.item_name = "name"
-                        self.current_item["name"] = ""
-                        self.item_bad = "rel" in params and params["rel"] == "nofollow"
-
-            elif tag == "article":
-                self.article_found = True
-                self.current_item = {}
-
-        def handle_data(self, data):
-            if self.item_name:
-                self.current_item[self.item_name] += data
-
-        def handle_endtag(self, tag):
-            if tag == "article":
-                self.article_found = False
-            elif self.item_name and (tag == "a" or tag == "td"):
-                self.item_name = None
-            elif self.item_found and tag == "tr":
-                self.item_found = False
-                if not self.item_bad:
-                    prettyPrinter(self.current_item)
-                self.current_item = {}
-
-    def search(self, query, cat='all'):
-        """ Performs search """
-        query = query.replace("%20", "-")
-
-        parser = self.MyHtmlParser(self.url)
-        page = "".join((self.url, "/", self.supported_categories[cat], "/torrents/", query, ".html?sort=seeds&page=1"))
-        html = retrieve_url(page)
-        parser.feed(html)
-
-        counter = 1
-        additional_pages = re_compile("/{0}/torrents/{1}.html\?sort=seeds&page=[0-9]+".format(self.supported_categories[cat], query))
-        list_searches = additional_pages.findall(html)[:-1] #last link is next(i.e. second)
-        for page in map(lambda link: "".join((self.url, link)), list_searches):
-            html = retrieve_url(page)
-            parser.feed(html)
-            counter += 1
-            if counter > 3:
-                break
-        parser.close()
diff --git a/src/searchengine/nova3/engines/torrentz.png b/src/searchengine/nova3/engines/torrentz.png
deleted file mode 100644
index aa17da22c1dfca17c64d30accee3c92cfcc88d74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E08u$n`vpsdK}1NED7=p
zW^j0RBMrz=@^o<w;fPLNvp)ULc?PGmWj$xAH!ig9IrCd`Cclx9JnJS#ht0fF<+~P5
Q1*&H7boFyt=akR{05o$Tt^fc4

diff --git a/src/searchengine/nova3/engines/torrentz.py b/src/searchengine/nova3/engines/torrentz.py
deleted file mode 100644
index 9cf64cf50..000000000
--- a/src/searchengine/nova3/engines/torrentz.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#VERSION: 2.22
-#AUTHORS: 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
-from html.parser import HTMLParser
-from urllib.parse import urlencode
-
-class torrentz(object):
-    # mandatory properties
-    url  = 'https://torrentz2.eu'
-    name = 'Torrentz2'
-    supported_categories = {'all': ''}
-
-    trackers_list = ['udp://tracker.coppersurfer.tk:6969/announce',
-                    'udp://tracker.opentrackr.org:1337/announce',
-                    'udp://tracker.zer0day.to:1337/announce',
-                    'udp://tracker.leechers-paradise.org:6969/announce',
-                    'udp://9.rarbg.com:2710/announce',
-                    'udp://explodie.org:6969/announce']
-
-    class MyHtmlParser(HTMLParser):
-        def __init__(self, results, url, trackers):
-            HTMLParser.__init__(self)
-            self.results = results
-            self.url = url
-            self.trackers = trackers
-            self.td_counter = None
-            self.current_item = None
-
-        def handle_starttag(self, tag, attrs):
-            params = dict(attrs)
-            if tag == 'a':
-                if 'href' in params:
-                    self.current_item = {}
-                    self.td_counter = 0
-                    self.current_item['link'] = 'magnet:?xt=urn:btih:' + \
-                        params['href'].strip(' /') + self.trackers
-                    self.current_item['desc_link'] = self.url + params['href'].strip()
-            elif tag == 'span':
-                if self.td_counter is not None:
-                    self.td_counter += 1
-                    if self.td_counter > 5: # safety
-                        self.td_counter = None
-
-        def handle_data(self, data):
-            if self.td_counter == 0:
-                if 'name' not in self.current_item:
-                    self.current_item['name'] = ''
-                self.current_item['name'] += data
-            elif self.td_counter == 3:
-                if 'size' not in self.current_item:
-                    self.current_item['size'] = data.strip()
-                    if self.current_item['size'] == 'Pending':
-                        self.current_item['size'] = ''
-            elif self.td_counter == 4:
-                if 'seeds' not in self.current_item:
-                    self.current_item['seeds'] = data.strip().replace(',', '')
-                    if not self.current_item['seeds'].isdigit():
-                        self.current_item['seeds'] = 0
-            elif self.td_counter == 5:
-                if 'leech' not in self.current_item:
-                    self.current_item['leech'] = data.strip().replace(',', '')
-                    if not self.current_item['leech'].isdigit():
-                        self.current_item['leech'] = 0
-
-                # display item
-                self.td_counter = None
-                self.current_item['engine_url'] = self.url
-                if self.current_item['name'].find(' »'):
-                    self.current_item['name'] = self.current_item['name'].split(' »')[0]
-                self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name']})
-
-                prettyPrinter(self.current_item)
-                self.results.append('a')
-
-    def download_torrent(self, info):
-        print(download_file(info))
-
-    def search(self, what, cat='all'):
-        # initialize trackers for magnet links
-        trackers = '&' + '&'.join(urlencode({'tr' : tracker}) for tracker in self.trackers_list)
-
-        results_list = []
-        parser = self.MyHtmlParser(results_list, self.url, trackers)
-        i = 0
-        while i < 6:
-            # "what" is already urlencoded
-            html = retrieve_url(self.url + '/search?f=%s&p=%d' % (what, i))
-            parser.feed(html)
-            if len(results_list) < 1:
-                break
-            del results_list[:]
-            i += 1
-        parser.close()
diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt
deleted file mode 100644
index 2027c36e0..000000000
--- a/src/searchengine/nova3/engines/versions.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-btdb: 1.01
-demonoid: 1.23
-legittorrents: 2.02
-piratebay: 2.15
-torlock: 2.0
-torrentz: 2.22