diff --git a/src/searchengine.qrc b/src/searchengine.qrc index 567dc2e8e..13a2f3138 100644 --- a/src/searchengine.qrc +++ b/src/searchengine.qrc @@ -17,8 +17,6 @@ searchengine/nova/engines/piratebay.py searchengine/nova/engines/torlock.png searchengine/nova/engines/torlock.py - searchengine/nova/engines/torrentreactor.png - searchengine/nova/engines/torrentreactor.py searchengine/nova/engines/torrentz.png searchengine/nova/engines/torrentz.py searchengine/nova3/helpers.py @@ -38,8 +36,6 @@ searchengine/nova3/engines/piratebay.py searchengine/nova3/engines/torlock.png searchengine/nova3/engines/torlock.py - searchengine/nova3/engines/torrentreactor.png - searchengine/nova3/engines/torrentreactor.py searchengine/nova3/engines/torrentz.png searchengine/nova3/engines/torrentz.py searchengine/nova/nova2dl.py diff --git a/src/searchengine/nova/engines/demonoid.py b/src/searchengine/nova/engines/demonoid.py index c88d5ffe6..90b096d20 100644 --- a/src/searchengine/nova/engines/demonoid.py +++ b/src/searchengine/nova/engines/demonoid.py @@ -1,4 +1,4 @@ -#VERSION: 1.21 +#VERSION: 1.22 #AUTHORS: Douman (custparasite@gmx.se) #CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es) @@ -36,7 +36,7 @@ from helpers import download_file, retrieve_url class demonoid(object): """ Search engine class """ - url = "https://www.demonoid.pw" + url = "https://www.dnoid.me" name = "Demonoid" supported_categories = {'all': '0', 'music': '2', diff --git a/src/searchengine/nova/engines/torrentreactor.png b/src/searchengine/nova/engines/torrentreactor.png deleted file mode 100644 index 160726112..000000000 Binary files a/src/searchengine/nova/engines/torrentreactor.png and /dev/null differ diff --git a/src/searchengine/nova/engines/torrentreactor.py b/src/searchengine/nova/engines/torrentreactor.py deleted file mode 100644 index 201c196ff..000000000 --- a/src/searchengine/nova/engines/torrentreactor.py +++ /dev/null @@ -1,111 +0,0 @@ -#VERSION: 1.42 -#AUTHORS: Gekko Dam Beer (gekko04@users.sourceforge.net) -#CONTRIBUTORS: Christophe Dumez (chris@qbittorrent.org) -# Bruno Barbieri (brunorex@gmail.com) - -# 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 download_file, retrieve_url -import urllib -from HTMLParser import HTMLParser -from re import compile as re_compile - -class torrentreactor(object): - url = 'https://torrentreactor.com' - name = 'TorrentReactor' - supported_categories = {'all': '', 'movies': '5', 'tv': '8', 'music': '6', 'games': '3', 'anime': '1', 'software': '2'} - - def download_torrent(self, info): - print(download_file(info)) - - class SimpleHTMLParser(HTMLParser): - def __init__(self, results, url): - HTMLParser.__init__(self) - self.td_counter = None - self.current_item = None - self.results = results - self.id = None - self.url = url - self.torrents_matcher = re_compile("/torrents/\d+.*") - self.dispatcher = { 'a' : self.start_a, 'td' : self.start_td } - - def handle_starttag(self, tag, attrs): - if tag in self.dispatcher: - self.dispatcher[tag](attrs) - - def start_a(self, attr): - params = dict(attr) - if self.torrents_matcher.match(params['href']): - self.current_item = {} - self.current_item['desc_link'] = self.url+params['href'].strip() - elif 'torrentreactor.net/download.php' in params['href']: - self.td_counter = 0 - self.current_item['link'] = params['href'].strip() - self.current_item['name'] = urllib.unquote_plus(params['href'].split('&')[1].split('name=')[1]) - - def handle_data(self, data): - if self.td_counter == 1: - if 'size' not in self.current_item: - self.current_item['size'] = '' - self.current_item['size']+= data.strip() - elif self.td_counter == 2: - if 'seeds' not in self.current_item: - self.current_item['seeds'] = '' - self.current_item['seeds']+= data.strip() - elif self.td_counter == 3: - if 'leech' not in self.current_item: - self.current_item['leech'] = '' - self.current_item['leech']+= data.strip() - - def start_td(self,attr): - if isinstance(self.td_counter,int): - self.td_counter += 1 - if self.td_counter > 3: - self.td_counter = None - # add item to results - if self.current_item: - self.current_item['engine_url'] = self.url - if not self.current_item['seeds'].isdigit(): - self.current_item['seeds'] = 0 - if not self.current_item['leech'].isdigit(): - self.current_item['leech'] = 0 - prettyPrinter(self.current_item) - self.has_results = True - self.results.append('a') - - def search(self, what, cat='all'): - i = 0 - dat = '' - results = [] - parser = self.SimpleHTMLParser(results, self.url) - while i < 9: - dat = retrieve_url('%s/torrents-search/%s/%s?sort=seeders.desc&type=all&period=none&categories=%s'%(self.url, what, (i*35), self.supported_categories[cat])) - parser.feed(dat) - if len(results) <= 0: - break - del results[:] - i += 1 - parser.close() diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt index 442f1f950..8b69f8e2c 100644 --- a/src/searchengine/nova/engines/versions.txt +++ b/src/searchengine/nova/engines/versions.txt @@ -1,8 +1,7 @@ -demonoid: 1.21 +demonoid: 1.22 extratorrent: 2.05 legittorrents: 2.01 mininova: 2.02 piratebay: 2.15 torlock: 2.0 -torrentreactor: 1.42 torrentz: 2.22 diff --git a/src/searchengine/nova3/engines/demonoid.py b/src/searchengine/nova3/engines/demonoid.py index 694dbcfbc..85efa227c 100644 --- a/src/searchengine/nova3/engines/demonoid.py +++ b/src/searchengine/nova3/engines/demonoid.py @@ -1,4 +1,4 @@ -#VERSION: 1.21 +#VERSION: 1.22 #AUTHORS: Douman (custparasite@gmx.se) #CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es) @@ -36,7 +36,7 @@ from helpers import download_file, retrieve_url class demonoid(object): """ Search engine class """ - url = "https://www.demonoid.pw" + url = "https://www.dnoid.me" name = "Demonoid" supported_categories = {'all': '0', 'music': '2', diff --git a/src/searchengine/nova3/engines/torrentreactor.png b/src/searchengine/nova3/engines/torrentreactor.png deleted file mode 100644 index 160726112..000000000 Binary files a/src/searchengine/nova3/engines/torrentreactor.png and /dev/null differ diff --git a/src/searchengine/nova3/engines/torrentreactor.py b/src/searchengine/nova3/engines/torrentreactor.py deleted file mode 100644 index 33c95fa0e..000000000 --- a/src/searchengine/nova3/engines/torrentreactor.py +++ /dev/null @@ -1,111 +0,0 @@ -#VERSION: 1.42 -#AUTHORS: Gekko Dam Beer (gekko04@users.sourceforge.net) -#CONTRIBUTORS: Christophe Dumez (chris@qbittorrent.org) -# Bruno Barbieri (brunorex@gmail.com) - -# 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 download_file, retrieve_url -from urllib import parse -from html.parser import HTMLParser -from re import compile as re_compile - -class torrentreactor(object): - url = 'https://torrentreactor.com' - name = 'TorrentReactor' - supported_categories = {'all': '', 'movies': '5', 'tv': '8', 'music': '6', 'games': '3', 'anime': '1', 'software': '2'} - - def download_torrent(self, info): - print(download_file(info)) - - class SimpleHTMLParser(HTMLParser): - def __init__(self, results, url): - HTMLParser.__init__(self) - self.td_counter = None - self.current_item = None - self.results = results - self.id = None - self.url = url - self.torrents_matcher = re_compile("/torrents/\d+.*") - self.dispatcher = { 'a' : self.start_a, 'td' : self.start_td } - - def handle_starttag(self, tag, attrs): - if tag in self.dispatcher: - self.dispatcher[tag](attrs) - - def start_a(self, attr): - params = dict(attr) - if self.torrents_matcher.match(params['href']): - self.current_item = {} - self.current_item['desc_link'] = self.url+params['href'].strip() - elif 'torrentreactor.net/download.php' in params['href']: - self.td_counter = 0 - self.current_item['link'] = params['href'].strip() - self.current_item['name'] = parse.unquote_plus(params['href'].split('&')[1].split('name=')[1]) - - def handle_data(self, data): - if self.td_counter == 1: - if 'size' not in self.current_item: - self.current_item['size'] = '' - self.current_item['size']+= data.strip() - elif self.td_counter == 2: - if 'seeds' not in self.current_item: - self.current_item['seeds'] = '' - self.current_item['seeds']+= data.strip() - elif self.td_counter == 3: - if 'leech' not in self.current_item: - self.current_item['leech'] = '' - self.current_item['leech']+= data.strip() - - def start_td(self,attr): - if isinstance(self.td_counter,int): - self.td_counter += 1 - if self.td_counter > 3: - self.td_counter = None - # add item to results - if self.current_item: - self.current_item['engine_url'] = self.url - if not self.current_item['seeds'].isdigit(): - self.current_item['seeds'] = 0 - if not self.current_item['leech'].isdigit(): - self.current_item['leech'] = 0 - prettyPrinter(self.current_item) - self.has_results = True - self.results.append('a') - - def search(self, what, cat='all'): - i = 0 - dat = '' - results = [] - parser = self.SimpleHTMLParser(results, self.url) - while i < 9: - dat = retrieve_url('%s/torrents-search/%s/%s?sort=seeders.desc&type=all&period=none&categories=%s'%(self.url, what, (i*35), self.supported_categories[cat])) - parser.feed(dat) - if len(results) <= 0: - break - del results[:] - i += 1 - parser.close() diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt index 442f1f950..8b69f8e2c 100644 --- a/src/searchengine/nova3/engines/versions.txt +++ b/src/searchengine/nova3/engines/versions.txt @@ -1,8 +1,7 @@ -demonoid: 1.21 +demonoid: 1.22 extratorrent: 2.05 legittorrents: 2.01 mininova: 2.02 piratebay: 2.15 torlock: 2.0 -torrentreactor: 1.42 torrentz: 2.22