Merge pull request #5904 from yezezey/extra_magnet

Fix extratorrent searchengine. Closes #5773

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"):
+                    if link.startswith("/torrent/"):
-                        return
-
-                    if link[8] == "/":
                         #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] == "_":
+                    elif link.startswith("magnet"):
-                        #download link
+                        #magnet link
-                        link = link.replace("torrent_", "", 1)
+                        self.current_item["link"] = link
-                        self.current_item["link"] = "".join((self.url, link))
 
                 elif tag == "td":
                     if self.pending_size:

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

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"):
+                    if link.startswith("/torrent/"):
-                        return
-
-                    if link[8] == "/":
                         #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] == "_":
+                    elif link.startswith("magnet"):
-                        #download link
+                        #magnet link
-                        link = link.replace("torrent_", "", 1)
+                        self.current_item["link"] = link
-                        self.current_item["link"] = "".join((self.url, link))
 
                 elif tag == "td":
                     if self.pending_size:

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