Merge pull request #5170 from ngosang/fixsearch

[Seach engine] Update Torrentz, Mininova and LegitTorrents plugins

src/searchengine/nova/engines/legittorrents.py

@@ -1,4 +1,4 @@
-#VERSION: 2.00
+#VERSION: 2.01
 #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 "class" in params and params["class"].startswith("#FF"):
+                    if "width" in params and params["width"] == "30":
                         self.save_item_key = "leech" if "seeds" in self.current_item else "seeds"
 
             elif tag == "tr":

src/searchengine/nova/engines/mininova.py

@@ -1,4 +1,4 @@
-#VERSION: 2.01
+#VERSION: 2.02
 #AUTHORS: Christophe Dumez (chris@qbittorrent.org)
 #CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es)
 
@@ -90,6 +90,9 @@ class mininova(object):
             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"] = ""

src/searchengine/nova/engines/torrentz.py

@@ -1,4 +1,4 @@
-#VERSION: 2.18
+#VERSION: 2.19
 #AUTHORS: Diego de las Heras (ngosang@hotmail.es)
 
 # Redistribution and use in source and binary forms, with or without
@@ -92,10 +92,9 @@ class torrentz(object):
                 # display item
                 self.td_counter = None
                 self.current_item['engine_url'] = self.url
-                if self.current_item['name'].find(u' \xc2'):
+                if self.current_item['name'].find(u' \xbb'):
-                    self.current_item['name'] = self.current_item['name'].split(u' \xc2')[0]
+                    self.current_item['name'] = self.current_item['name'].split(u' \xbb')[0]
-                self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name']})
+                self.current_item['link'] += '&' + urlencode({'dn' : self.current_item['name'].encode('utf-8')})
-                self.current_item['name'] = self.current_item['name'].decode('utf8')
 
                 prettyPrinter(self.current_item)
                 self.results.append('a')

src/searchengine/nova/engines/versions.txt

@@ -2,9 +2,9 @@ btdigg: 1.31
 demonoid: 1.2
 extratorrent: 2.04
 kickasstorrents: 1.28
-legittorrents: 2.00
+legittorrents: 2.01
-mininova: 2.01
+mininova: 2.02
 piratebay: 2.14
 torlock: 2.0
 torrentreactor: 1.41
-torrentz: 2.18
+torrentz: 2.19

src/searchengine/nova3/engines/legittorrents.py

@@ -1,4 +1,4 @@
-#VERSION: 2.00
+#VERSION: 2.01
 #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 "class" in params and params["class"].startswith("#FF"):
+                    if "width" in params and params["width"] == "30":
                         self.save_item_key = "leech" if "seeds" in self.current_item else "seeds"
 
             elif tag == "tr":

src/searchengine/nova3/engines/mininova.py

@@ -1,4 +1,4 @@
-#VERSION: 2.01
+#VERSION: 2.02
 #AUTHORS: Christophe Dumez (chris@qbittorrent.org)
 #CONTRIBUTORS: Diego de las Heras (ngosang@hotmail.es)
 
@@ -90,6 +90,9 @@ class mininova(object):
             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"] = ""

src/searchengine/nova3/engines/versions.txt

@@ -2,8 +2,8 @@ btdigg: 1.31
 demonoid: 1.2
 extratorrent: 2.04
 kickasstorrents: 1.28
-legittorrents: 2.00
+legittorrents: 2.01
-mininova: 2.01
+mininova: 2.02
 piratebay: 2.14
 torlock: 2.0
 torrentreactor: 1.41