diff --git a/src/searchengine.qrc b/src/searchengine.qrc
index f4d7169fd..2f94cae5f 100644
--- a/src/searchengine.qrc
+++ b/src/searchengine.qrc
@@ -9,8 +9,6 @@
searchengine/nova/engines/btdb.py
searchengine/nova/engines/demonoid.png
searchengine/nova/engines/demonoid.py
- searchengine/nova/engines/extratorrent.png
- searchengine/nova/engines/extratorrent.py
searchengine/nova/engines/legittorrents.png
searchengine/nova/engines/legittorrents.py
searchengine/nova/engines/piratebay.png
@@ -28,8 +26,6 @@
searchengine/nova3/engines/btdb.py
searchengine/nova3/engines/demonoid.png
searchengine/nova3/engines/demonoid.py
- searchengine/nova3/engines/extratorrent.png
- searchengine/nova3/engines/extratorrent.py
searchengine/nova3/engines/legittorrents.png
searchengine/nova3/engines/legittorrents.py
searchengine/nova3/engines/piratebay.png
diff --git a/src/searchengine/nova/engines/extratorrent.png b/src/searchengine/nova/engines/extratorrent.png
deleted file mode 100644
index d7da4954a..000000000
Binary files a/src/searchengine/nova/engines/extratorrent.png and /dev/null differ
diff --git a/src/searchengine/nova/engines/extratorrent.py b/src/searchengine/nova/engines/extratorrent.py
deleted file mode 100644
index 12c26f3dc..000000000
--- a/src/searchengine/nova/engines/extratorrent.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#VERSION: 3.10
-#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 xml.dom import minidom
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class extratorrent(object):
- """ Search engine class """
- url = 'https://extra.to'
- name = 'ExtraTorrent'
- supported_categories = {'all' : '0',
- 'movies' : '4',
- 'tv' : '8',
- 'music' : '5',
- 'games' : '3',
- 'anime' : '1',
- 'software' : '7',
- 'books' : '2',
- 'pictures' : '6'}
-
- def download_torrent(self, info):
- """ Downloader """
- print(download_file(info))
-
- def search(self, what, cat="all"):
- """ Performs search """
- query = "".join((self.url, "/rss.xml?type=search&search=", what, "&cid=", self.supported_categories[cat]))
- response = retrieve_url(query)
-
- xmldoc = minidom.parseString(response)
- itemlist = xmldoc.getElementsByTagName('item')
- for item in itemlist:
- current_item = current_item = {"engine_url" : self.url}
- current_item['name'] = item.getElementsByTagName('title')[0].childNodes[0].data
- current_item["link"] = item.getElementsByTagName('enclosure')[0].attributes['url'].value.replace('extratorrent.cc', 'extra.to')
- current_item["desc_link"] = item.getElementsByTagName('link')[0].childNodes[0].data.replace('extratorrent.cc', 'extra.to')
- current_item["size"] = item.getElementsByTagName('size')[0].childNodes[0].data
- current_item["leech"] = item.getElementsByTagName('leechers')[0].childNodes[0].data
- if not current_item["leech"].isdigit():
- current_item["leech"] = ''
- current_item["seeds"] = item.getElementsByTagName('seeders')[0].childNodes[0].data
- if not current_item["seeds"].isdigit():
- current_item["seeds"] = ''
-
- prettyPrinter(current_item)
-
- return
diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt
index ac6e0c72d..2027c36e0 100644
--- a/src/searchengine/nova/engines/versions.txt
+++ b/src/searchengine/nova/engines/versions.txt
@@ -1,6 +1,5 @@
btdb: 1.01
demonoid: 1.23
-extratorrent: 3.10
legittorrents: 2.02
piratebay: 2.15
torlock: 2.0
diff --git a/src/searchengine/nova3/engines/extratorrent.png b/src/searchengine/nova3/engines/extratorrent.png
deleted file mode 100644
index d7da4954a..000000000
Binary files a/src/searchengine/nova3/engines/extratorrent.png and /dev/null differ
diff --git a/src/searchengine/nova3/engines/extratorrent.py b/src/searchengine/nova3/engines/extratorrent.py
deleted file mode 100644
index 12c26f3dc..000000000
--- a/src/searchengine/nova3/engines/extratorrent.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#VERSION: 3.10
-#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 xml.dom import minidom
-#qBt
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class extratorrent(object):
- """ Search engine class """
- url = 'https://extra.to'
- name = 'ExtraTorrent'
- supported_categories = {'all' : '0',
- 'movies' : '4',
- 'tv' : '8',
- 'music' : '5',
- 'games' : '3',
- 'anime' : '1',
- 'software' : '7',
- 'books' : '2',
- 'pictures' : '6'}
-
- def download_torrent(self, info):
- """ Downloader """
- print(download_file(info))
-
- def search(self, what, cat="all"):
- """ Performs search """
- query = "".join((self.url, "/rss.xml?type=search&search=", what, "&cid=", self.supported_categories[cat]))
- response = retrieve_url(query)
-
- xmldoc = minidom.parseString(response)
- itemlist = xmldoc.getElementsByTagName('item')
- for item in itemlist:
- current_item = current_item = {"engine_url" : self.url}
- current_item['name'] = item.getElementsByTagName('title')[0].childNodes[0].data
- current_item["link"] = item.getElementsByTagName('enclosure')[0].attributes['url'].value.replace('extratorrent.cc', 'extra.to')
- current_item["desc_link"] = item.getElementsByTagName('link')[0].childNodes[0].data.replace('extratorrent.cc', 'extra.to')
- current_item["size"] = item.getElementsByTagName('size')[0].childNodes[0].data
- current_item["leech"] = item.getElementsByTagName('leechers')[0].childNodes[0].data
- if not current_item["leech"].isdigit():
- current_item["leech"] = ''
- current_item["seeds"] = item.getElementsByTagName('seeders')[0].childNodes[0].data
- if not current_item["seeds"].isdigit():
- current_item["seeds"] = ''
-
- prettyPrinter(current_item)
-
- return
diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt
index ac6e0c72d..2027c36e0 100644
--- a/src/searchengine/nova3/engines/versions.txt
+++ b/src/searchengine/nova3/engines/versions.txt
@@ -1,6 +1,5 @@
btdb: 1.01
demonoid: 1.23
-extratorrent: 3.10
legittorrents: 2.02
piratebay: 2.15
torlock: 2.0