diff --git a/src/searchengine.qrc b/src/searchengine.qrc
index 13a2f3138..f4d7169fd 100644
--- a/src/searchengine.qrc
+++ b/src/searchengine.qrc
@@ -5,14 +5,14 @@
searchengine/nova/nova2.py
searchengine/nova/novaprinter.py
searchengine/nova/socks.py
+ searchengine/nova/engines/btdb.png
+ 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/mininova.png
- searchengine/nova/engines/mininova.py
searchengine/nova/engines/piratebay.png
searchengine/nova/engines/piratebay.py
searchengine/nova/engines/torlock.png
@@ -24,14 +24,14 @@
searchengine/nova3/novaprinter.py
searchengine/nova3/sgmllib3.py
searchengine/nova3/socks.py
+ searchengine/nova3/engines/btdb.png
+ 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/mininova.png
- searchengine/nova3/engines/mininova.py
searchengine/nova3/engines/piratebay.png
searchengine/nova3/engines/piratebay.py
searchengine/nova3/engines/torlock.png
diff --git a/src/searchengine/nova/engines/btdb.png b/src/searchengine/nova/engines/btdb.png
new file mode 100644
index 000000000..b63314b9d
Binary files /dev/null and b/src/searchengine/nova/engines/btdb.png differ
diff --git a/src/searchengine/nova/engines/btdb.py b/src/searchengine/nova/engines/btdb.py
new file mode 100644
index 000000000..58ed79c78
--- /dev/null
+++ b/src/searchengine/nova/engines/btdb.py
@@ -0,0 +1,147 @@
+#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.py b/src/searchengine/nova/engines/demonoid.py
index 90b096d20..53a6ff509 100644
--- a/src/searchengine/nova/engines/demonoid.py
+++ b/src/searchengine/nova/engines/demonoid.py
@@ -1,4 +1,4 @@
-#VERSION: 1.22
+#VERSION: 1.23
#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.dnoid.me"
+ url = "https://www.demonoid.pw"
name = "Demonoid"
supported_categories = {'all': '0',
'music': '2',
diff --git a/src/searchengine/nova/engines/legittorrents.py b/src/searchengine/nova/engines/legittorrents.py
index 430ccf531..5cacfc826 100644
--- a/src/searchengine/nova/engines/legittorrents.py
+++ b/src/searchengine/nova/engines/legittorrents.py
@@ -1,4 +1,4 @@
-#VERSION: 2.01
+#VERSION: 2.02
#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
# Douman (custparasite@gmx.se)
@@ -61,7 +61,7 @@ class legittorrents(object):
elif link.startswith("download"):
self.current_item["link"] = "/".join((self.url, link))
elif tag == "td":
- if "width" in params and params["width"] == "30":
+ 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":
diff --git a/src/searchengine/nova/engines/mininova.png b/src/searchengine/nova/engines/mininova.png
deleted file mode 100644
index 672e0688f..000000000
Binary files a/src/searchengine/nova/engines/mininova.png and /dev/null differ
diff --git a/src/searchengine/nova/engines/mininova.py b/src/searchengine/nova/engines/mininova.py
deleted file mode 100644
index b001d89f1..000000000
--- a/src/searchengine/nova/engines/mininova.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#VERSION: 2.02
-#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 HTMLParser import HTMLParser
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class mininova(object):
- """ Search engine class """
- url = 'http://www.mininova.org'
- name = 'Mininova'
- supported_categories = {'all' : '0',
- 'movies' : '4',
- 'tv' : '8',
- 'music' : '5',
- 'games' : '3',
- 'anime' : '1',
- 'software' : '7',
- 'pictures' : '6',
- 'books' : '2'}
-
- def download_torrent(self, info):
- 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.table_results = False
- self.current_item = None
- self.cur_item_name = None
- self.next_queries = True
-
- def handle_starttag_tr(self, _):
- """ Handler of tr start tag """
- self.current_item = dict()
-
- def handle_starttag_a(self, attrs):
- """ Handler of a start tag """
- params = dict(attrs)
- link = params["href"]
-
- if link.startswith("/tor/"):
- #description
- self.current_item["desc_link"] = "".join((self.url, link))
- #get download link from description by id
- self.current_item["link"] = "".join((self.url, "/get/", link[5:-2]))
- self.cur_item_name = "name"
- self.current_item["name"] = ""
- elif self.next_queries and link.startswith("/search"):
- if params["title"].startswith("Page"):
- self.list_searches.append(link)
-
- def handle_starttag_td(self, attrs):
- """ Handler of td start tag """
- if ("align", "right") in attrs:
- if not "size" in self.current_item:
- self.cur_item_name = "size"
- self.current_item["size"] = ""
-
- def handle_starttag_span(self, attrs):
- """ Handler of span start tag """
- if ("class", "g") in attrs:
- self.cur_item_name = "seeds"
- self.current_item["seeds"] = ""
- elif ("class", "r") in attrs:
- self.cur_item_name = "seeds"
- self.current_item["seeds"] = ""
- elif ("class", "b") in attrs:
- self.cur_item_name = "leech"
- self.current_item["leech"] = ""
-
- def handle_starttag(self, tag, attrs):
- """ Parser's start tag handler """
- if self.table_results:
- dispatcher = getattr(self, "_".join(("handle_starttag", tag)), None)
- if dispatcher:
- dispatcher(attrs)
-
- elif tag == "table":
- self.table_results = ("class", "maintable") in attrs
-
- def handle_endtag(self, tag):
- """ Parser's end tag handler """
- if tag == "tr" and self.current_item:
- self.current_item["engine_url"] = self.url
- prettyPrinter(self.current_item)
- self.current_item = None
- elif self.cur_item_name:
- if tag == "a" or tag == "td":
- self.cur_item_name = None
-
- def handle_data(self, data):
- """ Parser's data handler """
- if self.cur_item_name:
- temp = self.current_item[self.cur_item_name]
- self.current_item[self.cur_item_name] = " ".join((temp, data))
-
- def search(self, what, cat="all"):
- """ Performs search """
- query = "/".join((self.url, "search", what, self.supported_categories[cat], "seeds"))
-
- response = retrieve_url(query)
-
- list_searches = []
- parser = self.MyHtmlParseWithBlackJack(list_searches, self.url)
- parser.feed(response)
- parser.close()
-
- parser.next_queries = 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/versions.txt b/src/searchengine/nova/engines/versions.txt
index 134e0bd01..ac6e0c72d 100644
--- a/src/searchengine/nova/engines/versions.txt
+++ b/src/searchengine/nova/engines/versions.txt
@@ -1,7 +1,7 @@
-demonoid: 1.22
+btdb: 1.01
+demonoid: 1.23
extratorrent: 3.10
-legittorrents: 2.01
-mininova: 2.02
+legittorrents: 2.02
piratebay: 2.15
torlock: 2.0
torrentz: 2.22
diff --git a/src/searchengine/nova3/engines/btdb.png b/src/searchengine/nova3/engines/btdb.png
new file mode 100644
index 000000000..b63314b9d
Binary files /dev/null and b/src/searchengine/nova3/engines/btdb.png differ
diff --git a/src/searchengine/nova3/engines/btdb.py b/src/searchengine/nova3/engines/btdb.py
new file mode 100644
index 000000000..555850af4
--- /dev/null
+++ b/src/searchengine/nova3/engines/btdb.py
@@ -0,0 +1,147 @@
+#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.py b/src/searchengine/nova3/engines/demonoid.py
index 85efa227c..1372ac9dd 100644
--- a/src/searchengine/nova3/engines/demonoid.py
+++ b/src/searchengine/nova3/engines/demonoid.py
@@ -1,4 +1,4 @@
-#VERSION: 1.22
+#VERSION: 1.23
#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.dnoid.me"
+ url = "https://www.demonoid.pw"
name = "Demonoid"
supported_categories = {'all': '0',
'music': '2',
diff --git a/src/searchengine/nova3/engines/legittorrents.py b/src/searchengine/nova3/engines/legittorrents.py
index 845ee9006..16095c72f 100644
--- a/src/searchengine/nova3/engines/legittorrents.py
+++ b/src/searchengine/nova3/engines/legittorrents.py
@@ -1,4 +1,4 @@
-#VERSION: 2.01
+#VERSION: 2.02
#AUTHORS: Christophe Dumez (chris@qbittorrent.org)
# Douman (custparasite@gmx.se)
@@ -61,7 +61,7 @@ class legittorrents(object):
elif link.startswith("download"):
self.current_item["link"] = "/".join((self.url, link))
elif tag == "td":
- if "width" in params and params["width"] == "30":
+ 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":
diff --git a/src/searchengine/nova3/engines/mininova.png b/src/searchengine/nova3/engines/mininova.png
deleted file mode 100644
index 672e0688f..000000000
Binary files a/src/searchengine/nova3/engines/mininova.png and /dev/null differ
diff --git a/src/searchengine/nova3/engines/mininova.py b/src/searchengine/nova3/engines/mininova.py
deleted file mode 100644
index 3e241d114..000000000
--- a/src/searchengine/nova3/engines/mininova.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#VERSION: 2.02
-#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 html.parser import HTMLParser
-from novaprinter import prettyPrinter
-from helpers import download_file, retrieve_url
-
-class mininova(object):
- """ Search engine class """
- url = 'http://www.mininova.org'
- name = 'Mininova'
- supported_categories = {'all' : '0',
- 'movies' : '4',
- 'tv' : '8',
- 'music' : '5',
- 'games' : '3',
- 'anime' : '1',
- 'software' : '7',
- 'pictures' : '6',
- 'books' : '2'}
-
- def download_torrent(self, info):
- 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.table_results = False
- self.current_item = None
- self.cur_item_name = None
- self.next_queries = True
-
- def handle_starttag_tr(self, _):
- """ Handler of tr start tag """
- self.current_item = dict()
-
- def handle_starttag_a(self, attrs):
- """ Handler of a start tag """
- params = dict(attrs)
- link = params["href"]
-
- if link.startswith("/tor/"):
- #description
- self.current_item["desc_link"] = "".join((self.url, link))
- #get download link from description by id
- self.current_item["link"] = "".join((self.url, "/get/", link[5:-2]))
- self.cur_item_name = "name"
- self.current_item["name"] = ""
- elif self.next_queries and link.startswith("/search"):
- if params["title"].startswith("Page"):
- self.list_searches.append(link)
-
- def handle_starttag_td(self, attrs):
- """ Handler of td start tag """
- if ("align", "right") in attrs:
- if not "size" in self.current_item:
- self.cur_item_name = "size"
- self.current_item["size"] = ""
-
- def handle_starttag_span(self, attrs):
- """ Handler of span start tag """
- if ("class", "g") in attrs:
- self.cur_item_name = "seeds"
- self.current_item["seeds"] = ""
- elif ("class", "r") in attrs:
- self.cur_item_name = "seeds"
- self.current_item["seeds"] = ""
- elif ("class", "b") in attrs:
- self.cur_item_name = "leech"
- self.current_item["leech"] = ""
-
- def handle_starttag(self, tag, attrs):
- """ Parser's start tag handler """
- if self.table_results:
- dispatcher = getattr(self, "_".join(("handle_starttag", tag)), None)
- if dispatcher:
- dispatcher(attrs)
-
- elif tag == "table":
- self.table_results = ("class", "maintable") in attrs
-
- def handle_endtag(self, tag):
- """ Parser's end tag handler """
- if tag == "tr" and self.current_item:
- self.current_item["engine_url"] = self.url
- prettyPrinter(self.current_item)
- self.current_item = None
- elif self.cur_item_name:
- if tag == "a" or tag == "td":
- self.cur_item_name = None
-
- def handle_data(self, data):
- """ Parser's data handler """
- if self.cur_item_name:
- temp = self.current_item[self.cur_item_name]
- self.current_item[self.cur_item_name] = " ".join((temp, data))
-
- def search(self, what, cat="all"):
- """ Performs search """
- query = "/".join((self.url, "search", what, self.supported_categories[cat], "seeds"))
-
- response = retrieve_url(query)
-
- list_searches = []
- parser = self.MyHtmlParseWithBlackJack(list_searches, self.url)
- parser.feed(response)
- parser.close()
-
- parser.next_queries = 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/versions.txt b/src/searchengine/nova3/engines/versions.txt
index 134e0bd01..ac6e0c72d 100644
--- a/src/searchengine/nova3/engines/versions.txt
+++ b/src/searchengine/nova3/engines/versions.txt
@@ -1,7 +1,7 @@
-demonoid: 1.22
+btdb: 1.01
+demonoid: 1.23
extratorrent: 3.10
-legittorrents: 2.01
-mininova: 2.02
+legittorrents: 2.02
piratebay: 2.15
torlock: 2.0
torrentz: 2.22