diff --git a/src/searchengine/nova/engines/extratorrent.py b/src/searchengine/nova/engines/extratorrent.py index ca3316a7b..07db8b5ed 100644 --- a/src/searchengine/nova/engines/extratorrent.py +++ b/src/searchengine/nova/engines/extratorrent.py @@ -1,4 +1,4 @@ -#VERSION: 2.05 +#VERSION: 2.06 #AUTHORS: Christophe Dumez (chris@qbittorrent.org) #CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es) @@ -68,19 +68,15 @@ class extratorrent(object): params = dict(attrs) link = params['href'] - if not link.startswith("/torrent"): - return - - if link[8] == "/": + if link.startswith("/torrent/"): #description self.current_item["desc_link"] = "".join((self.url, link)) #remove view at the beginning self.current_item["name"] = params["title"][5:-8].replace("&", "&") self.pending_size = True - elif link[8] == "_": - #download link - link = link.replace("torrent_", "", 1) - self.current_item["link"] = "".join((self.url, link)) + elif link.startswith("magnet"): + #magnet link + self.current_item["link"] = link elif tag == "td": if self.pending_size: diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt index 8b69f8e2c..034b795b3 100644 --- a/src/searchengine/nova/engines/versions.txt +++ b/src/searchengine/nova/engines/versions.txt @@ -1,5 +1,5 @@ demonoid: 1.22 -extratorrent: 2.05 +extratorrent: 2.06 legittorrents: 2.01 mininova: 2.02 piratebay: 2.15 diff --git a/src/searchengine/nova3/engines/extratorrent.py b/src/searchengine/nova3/engines/extratorrent.py index 3b205d30c..dbe71c535 100644 --- a/src/searchengine/nova3/engines/extratorrent.py +++ b/src/searchengine/nova3/engines/extratorrent.py @@ -1,4 +1,4 @@ -#VERSION: 2.05 +#VERSION: 2.06 #AUTHORS: Christophe Dumez (chris@qbittorrent.org) #CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es) @@ -68,19 +68,15 @@ class extratorrent(object): params = dict(attrs) link = params['href'] - if not link.startswith("/torrent"): - return - - if link[8] == "/": + if link.startswith("/torrent/"): #description self.current_item["desc_link"] = "".join((self.url, link)) #remove view at the beginning self.current_item["name"] = params["title"][5:-8].replace("&", "&") self.pending_size = True - elif link[8] == "_": - #download link - link = link.replace("torrent_", "", 1) - self.current_item["link"] = "".join((self.url, link)) + elif link.startswith("magnet"): + #magnet link + self.current_item["link"] = link elif tag == "td": if self.pending_size: diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt index 8b69f8e2c..034b795b3 100644 --- a/src/searchengine/nova3/engines/versions.txt +++ b/src/searchengine/nova3/engines/versions.txt @@ -1,5 +1,5 @@ demonoid: 1.22 -extratorrent: 2.05 +extratorrent: 2.06 legittorrents: 2.01 mininova: 2.02 piratebay: 2.15