From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/crypter/TurbobitNetFolder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/TurbobitNetFolder.py') diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index dcbd6a5d7..2ffcfae13 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -27,7 +27,7 @@ class TurbobitNetFolder(SimpleCrypter): def _getLinks(self, id, page=1): gridFile = self.load("http://turbobit.net/downloadfolder/gridFile", - get={"rootId": id, "rows": 200, "page": page}, decode=True) + get={"rootId": id, "rows": 200, "page": page}) grid = json_loads(gridFile) if grid['rows']: -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/crypter/TurbobitNetFolder.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/crypter/TurbobitNetFolder.py') diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index 2ffcfae13..f8e56712f 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -9,7 +9,7 @@ from module.common.json_layer import json_loads class TurbobitNetFolder(SimpleCrypter): __name__ = "TurbobitNetFolder" __type__ = "crypter" - __version__ = "0.05" + __version__ = "0.06" __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P\w+)' __config__ = [("use_premium" , "bool", "Use premium account if available" , True), @@ -25,7 +25,7 @@ class TurbobitNetFolder(SimpleCrypter): NAME_PATTERN = r'src=\'/js/lib/grid/icon/folder.png\'> (?P.+?)' - def _getLinks(self, id, page=1): + def _get_links(self, id, page=1): gridFile = self.load("http://turbobit.net/downloadfolder/gridFile", get={"rootId": id, "rows": 200, "page": page}) grid = json_loads(gridFile) @@ -33,16 +33,16 @@ class TurbobitNetFolder(SimpleCrypter): if grid['rows']: for i in grid['rows']: yield i['id'] - for id in self._getLinks(id, page + 1): + for id in self._get_links(id, page + 1): yield id else: return - def getLinks(self): + def get_links(self): id = re.match(self.__pattern__, self.pyfile.url).group('ID') fixurl = lambda id: "http://turbobit.net/%s.html" % id - return map(fixurl, self._getLinks(id)) + return map(fixurl, self._get_links(id)) getInfo = create_getInfo(TurbobitNetFolder) -- cgit v1.2.3 From a0e2459f2d1506912ac4a5d0c330c8dae01a4768 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 00:28:18 +0200 Subject: Improve fixurl method --- module/plugins/crypter/TurbobitNetFolder.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'module/plugins/crypter/TurbobitNetFolder.py') diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index f8e56712f..4d07704fb 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -40,9 +40,7 @@ class TurbobitNetFolder(SimpleCrypter): def get_links(self): - id = re.match(self.__pattern__, self.pyfile.url).group('ID') - fixurl = lambda id: "http://turbobit.net/%s.html" % id - return map(fixurl, self._get_links(id)) + return ["http://turbobit.net/%s.html" % id for id in self._get_links(self.info['pattern']['ID'])] getInfo = create_getInfo(TurbobitNetFolder) -- cgit v1.2.3 From ff9383bfe06d14d23bc0ed6af79aa8967965d078 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 10:59:52 +0200 Subject: Code cosmetics (3) --- module/plugins/crypter/TurbobitNetFolder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/TurbobitNetFolder.py') diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index 4d07704fb..76489eebf 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -27,7 +27,7 @@ class TurbobitNetFolder(SimpleCrypter): def _get_links(self, id, page=1): gridFile = self.load("http://turbobit.net/downloadfolder/gridFile", - get={"rootId": id, "rows": 200, "page": page}) + get={'rootId': id, 'rows': 200, 'page': page}) grid = json_loads(gridFile) if grid['rows']: -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/crypter/TurbobitNetFolder.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/crypter/TurbobitNetFolder.py') diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index 76489eebf..763d04bb0 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -10,6 +10,7 @@ class TurbobitNetFolder(SimpleCrypter): __name__ = "TurbobitNetFolder" __type__ = "crypter" __version__ = "0.06" + __status__ = "stable" __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P\w+)' __config__ = [("use_premium" , "bool", "Use premium account if available" , True), -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/crypter/TurbobitNetFolder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/crypter/TurbobitNetFolder.py') diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py index 763d04bb0..3a36f5032 100644 --- a/module/plugins/crypter/TurbobitNetFolder.py +++ b/module/plugins/crypter/TurbobitNetFolder.py @@ -10,7 +10,7 @@ class TurbobitNetFolder(SimpleCrypter): __name__ = "TurbobitNetFolder" __type__ = "crypter" __version__ = "0.06" - __status__ = "stable" + __status__ = "testing" __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P\w+)' __config__ = [("use_premium" , "bool", "Use premium account if available" , True), -- cgit v1.2.3