From b8c4a86348142bd35d4c740c89f734bc788163b8 Mon Sep 17 00:00:00 2001 From: ngosang Date: Thu, 7 Jan 2016 01:41:16 +0100 Subject: [PATCH 1/2] [search engine] Fix PirateBay plugin implementation for Python 3 --- src/searchengine/nova3/engines/piratebay.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/searchengine/nova3/engines/piratebay.py b/src/searchengine/nova3/engines/piratebay.py index 9b7e78be0..8774f53e6 100644 --- a/src/searchengine/nova3/engines/piratebay.py +++ b/src/searchengine/nova3/engines/piratebay.py @@ -141,10 +141,8 @@ class piratebay(object): if self.save_item == "size": temp_data = data.split() if "Size" in temp_data: - self.current_item[self.save_item] = temp_data[2] - elif "ULed" in temp_data: - temp_string = self.current_item[self.save_item] - self.current_item[self.save_item] = " ".join((temp_string, temp_data[0][:-1])) + indx = temp_data.index("Size") + self.current_item[self.save_item] = temp_data[indx + 1] + " " + temp_data[indx + 2] elif self.save_item == "name": # names with special characters like '&' are splitted in several pieces From 1e8299f842d5be8afc07cb9d2e65985aa9dccfca Mon Sep 17 00:00:00 2001 From: ngosang Date: Thu, 7 Jan 2016 01:45:06 +0100 Subject: [PATCH 2/2] [search engine] Update PirateBay URL. Closes #4470 --- src/searchengine/nova/engines/piratebay.py | 6 +++--- src/searchengine/nova/engines/versions.txt | 2 +- src/searchengine/nova3/engines/piratebay.py | 6 +++--- src/searchengine/nova3/engines/versions.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/searchengine/nova/engines/piratebay.py b/src/searchengine/nova/engines/piratebay.py index 3fe840bdf..abd36a6cd 100644 --- a/src/searchengine/nova/engines/piratebay.py +++ b/src/searchengine/nova/engines/piratebay.py @@ -1,4 +1,4 @@ -#VERSION: 2.11 +#VERSION: 2.12 #AUTHORS: Fabien Devaux (fab@gnux.info) #CONTRIBUTORS: Christophe Dumez (chris@qbittorrent.org) # Arthur (custparasite@gmx.se) @@ -36,7 +36,7 @@ from helpers import download_file class piratebay(object): """ Search engine class """ - url = 'https://thepiratebay.gd' + url = 'https://thepiratebay.ms' name = 'The Pirate Bay' supported_categories = {'all': '0', 'music': '100', 'movies': '200', 'games': '400', 'software': '300'} @@ -159,7 +159,7 @@ class piratebay(object): def search(self, what, cat='all'): """ Performs search """ - connection = https("thepiratebay.gd") + connection = https("thepiratebay.ms") #prepare query. 7 is filtering by seeders cat = cat.lower() diff --git a/src/searchengine/nova/engines/versions.txt b/src/searchengine/nova/engines/versions.txt index ddd8b0caf..3980f0e34 100644 --- a/src/searchengine/nova/engines/versions.txt +++ b/src/searchengine/nova/engines/versions.txt @@ -4,6 +4,6 @@ extratorrent: 2.02 kickasstorrents: 1.28 legittorrents: 2.00 mininova: 2.00 -piratebay: 2.11 +piratebay: 2.12 torrentreactor: 1.40 torrentz: 2.17 diff --git a/src/searchengine/nova3/engines/piratebay.py b/src/searchengine/nova3/engines/piratebay.py index 8774f53e6..9ffeab4af 100644 --- a/src/searchengine/nova3/engines/piratebay.py +++ b/src/searchengine/nova3/engines/piratebay.py @@ -1,4 +1,4 @@ -#VERSION: 2.11 +#VERSION: 2.12 #AUTHORS: Fabien Devaux (fab@gnux.info) #CONTRIBUTORS: Christophe Dumez (chris@qbittorrent.org) # Arthur (custparasite@gmx.se) @@ -36,7 +36,7 @@ from helpers import download_file class piratebay(object): """ Search engine class """ - url = 'https://thepiratebay.gd' + url = 'https://thepiratebay.ms' name = 'The Pirate Bay' supported_categories = {'all': '0', 'music': '100', 'movies': '200', 'games': '400', 'software': '300'} @@ -157,7 +157,7 @@ class piratebay(object): def search(self, what, cat='all'): """ Performs search """ - connection = https("thepiratebay.gd") + connection = https("thepiratebay.ms") #prepare query. 7 is filtering by seeders cat = cat.lower() diff --git a/src/searchengine/nova3/engines/versions.txt b/src/searchengine/nova3/engines/versions.txt index ddd8b0caf..3980f0e34 100644 --- a/src/searchengine/nova3/engines/versions.txt +++ b/src/searchengine/nova3/engines/versions.txt @@ -4,6 +4,6 @@ extratorrent: 2.02 kickasstorrents: 1.28 legittorrents: 2.00 mininova: 2.00 -piratebay: 2.11 +piratebay: 2.12 torrentreactor: 1.40 torrentz: 2.17