From 3b7277cd0013539dd2cd65fd270f7643a5c3779a Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 30 Jun 2014 02:28:24 +0200 Subject: [RSDF] Improve code a bit (thx charlie89) --- module/plugins/container/RSDF.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 42296f2d5..f7d3f7377 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -6,9 +6,10 @@ import re from module.plugins.Container import Container + class RSDF(Container): __name__ = "RSDF" - __version__ = "0.21" + __version__ = "0.22" __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" __author_name__ = ("RaNaN", "spoob") @@ -38,10 +39,12 @@ class RSDF(Container): links = [] for link in data: + if link == '': + continue link = base64.b64decode(link) link = obj.decrypt(link) decryptedUrl = link.replace('CCF: ', '') links.append(decryptedUrl) - self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) + self.log.debug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) self.packages.append((pyfile.package().name, links)) -- cgit v1.2.3 From 2a79ebb957adf2ed610e6104fc00f7e51e835edc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 5 Jul 2014 03:21:06 +0200 Subject: Cleaned ShareLinksBiz pattern + better if-check for RSDF plugin --- module/plugins/container/RSDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index f7d3f7377..41cdfccb7 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -39,7 +39,7 @@ class RSDF(Container): links = [] for link in data: - if link == '': + if not link: continue link = base64.b64decode(link) link = obj.decrypt(link) -- cgit v1.2.3 From 94c003dce452e768bf8d1c6598bde2d954cc0af7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 6 Jul 2014 20:41:59 +0200 Subject: Use Base log methods --- module/plugins/container/RSDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 41cdfccb7..cc090a267 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -46,5 +46,5 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') links.append(decryptedUrl) - self.log.debug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) + self.logDebug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) self.packages.append((pyfile.package().name, links)) -- cgit v1.2.3 From 8e47b0de30a25d0fd5dfb518bfe4e1e7beff93fd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 15 Jul 2014 16:27:44 +0200 Subject: Key attributes cleanup for account, container and crypter plugins --- module/plugins/container/RSDF.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index cc090a267..2444ec752 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -10,11 +10,14 @@ from module.plugins.Container import Container class RSDF(Container): __name__ = "RSDF" __version__ = "0.22" + __pattern__ = r'.+\.rsdf' + __description__ = """RSDF container decrypter plugin""" __author_name__ = ("RaNaN", "spoob") __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org") + def decrypt(self, pyfile): from Crypto.Cipher import AES -- cgit v1.2.3 From a1e78f33dc2b0b6777fdcbc415673f3965b25542 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 16 Jul 2014 00:46:26 +0200 Subject: Prefer self.urls and self.packages for adding links --- module/plugins/container/RSDF.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 2444ec752..c35efacc6 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -40,14 +40,12 @@ class RSDF(Container): data = binascii.unhexlify(''.join(data.split())) data = data.splitlines() - links = [] for link in data: if not link: continue link = base64.b64decode(link) link = obj.decrypt(link) decryptedUrl = link.replace('CCF: ', '') - links.append(decryptedUrl) + self.urls.append(decryptedUrl) - self.logDebug("%s: adding package %s with %d links" % (self.__name__, pyfile.package().name, len(links))) - self.packages.append((pyfile.package().name, links)) + self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) -- cgit v1.2.3 From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Oct 2014 18:57:59 +0200 Subject: New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup --- module/plugins/container/RSDF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index c35efacc6..6c3271750 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -14,8 +14,8 @@ class RSDF(Container): __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" - __author_name__ = ("RaNaN", "spoob") - __author_mail__ = ("RaNaN@pyload.org", "spoob@pyload.org") + __authors__ = [("RaNaN", "RaNaN@pyload.org"), + ("spoob", "spoob@pyload.org")] def decrypt(self, pyfile): -- cgit v1.2.3 From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 8 Oct 2014 20:18:13 +0200 Subject: Add __license__ key attribute to plugins --- module/plugins/container/RSDF.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 6c3271750..4b9e3119a 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -14,6 +14,7 @@ class RSDF(Container): __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" + __license__ = "GPLv3" __authors__ = [("RaNaN", "RaNaN@pyload.org"), ("spoob", "spoob@pyload.org")] -- cgit v1.2.3 From c41d4ec4c5935ee702a44e919730971028bf5724 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Oct 2014 01:16:52 +0200 Subject: Fix and improve plugins logging --- module/plugins/container/RSDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 4b9e3119a..60afb5600 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -49,4 +49,4 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') self.urls.append(decryptedUrl) - self.log.debug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) + self.logDebug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) -- cgit v1.2.3 From 9f2ebe486a3e155fb6a60e07cccb77ab6a772eb2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 26 Oct 2014 02:31:54 +0200 Subject: Extend translation support in plugins + a lot of code cosmetics and typo fixes --- module/plugins/container/RSDF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 60afb5600..781b00326 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -49,4 +49,4 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') self.urls.append(decryptedUrl) - self.logDebug("%s: adding package %s with %d links" % (self.__name__,pyfile.package().name,len(links))) + self.logDebug("Adding package %s with %d links" % (pyfile.package().name, len(links))) -- cgit v1.2.3 From 0362f342d3526ded8650acb219e205d3f93c37a4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 26 Oct 2014 20:48:37 +0100 Subject: [RSDF] Fix typo (thx Guidobelix) --- module/plugins/container/RSDF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 781b00326..0819fcdea 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -9,7 +9,7 @@ from module.plugins.Container import Container class RSDF(Container): __name__ = "RSDF" - __version__ = "0.22" + __version__ = "0.23" __pattern__ = r'.+\.rsdf' @@ -49,4 +49,4 @@ class RSDF(Container): decryptedUrl = link.replace('CCF: ', '') self.urls.append(decryptedUrl) - self.logDebug("Adding package %s with %d links" % (pyfile.package().name, len(links))) + self.logDebug("Adding package %s with %d links" % (pyfile.package().name, len(self.urls))) -- cgit v1.2.3 From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 28 Oct 2014 16:52:10 +0100 Subject: Code cosmetics: plugin class attributes --- module/plugins/container/RSDF.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 0819fcdea..c3846b9e4 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -8,15 +8,15 @@ from module.plugins.Container import Container class RSDF(Container): - __name__ = "RSDF" + __name__ = "RSDF" __version__ = "0.23" __pattern__ = r'.+\.rsdf' __description__ = """RSDF container decrypter plugin""" - __license__ = "GPLv3" - __authors__ = [("RaNaN", "RaNaN@pyload.org"), - ("spoob", "spoob@pyload.org")] + __license__ = "GPLv3" + __authors__ = [("RaNaN", "RaNaN@pyload.org"), + ("spoob", "spoob@pyload.org")] def decrypt(self, pyfile): -- cgit v1.2.3 From bd8259220ab4d56ab419b7b32045b08cc9b0a7c8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 9 Nov 2014 03:08:19 +0100 Subject: Use with statement instead open method when accessing fod + handle i/o error --- module/plugins/container/RSDF.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index c3846b9e4..9c57c8ddb 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -5,6 +5,7 @@ import binascii import re from module.plugins.Container import Container +from module.utils import fs_encode class RSDF(Container): @@ -23,7 +24,7 @@ class RSDF(Container): from Crypto.Cipher import AES - infile = pyfile.url.replace("\n", "") + infile = fs_encode(pyfile.url.replace("\n", "")) Key = binascii.unhexlify('8C35192D964DC3182C6F84F3252239EB4A320D2500000000') IV = binascii.unhexlify('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF') @@ -32,10 +33,11 @@ class RSDF(Container): obj = AES.new(Key, AES.MODE_CFB, IV) - rsdf = open(infile, 'r') - - data = rsdf.read() - rsdf.close() + try: + with open(infile, 'r') as rsdf: + data = rsdf.read() + except IOError, e: + self.fail(str(e)) if re.search(r"404 - Not Found", data) is None: data = binascii.unhexlify(''.join(data.split())) -- cgit v1.2.3 From 52664e6fe8dd99fc9bb78ea8cf158c17705b6ded Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 5 Dec 2014 19:18:11 +0100 Subject: Fix with statement on old env like python 2.5 (2) --- module/plugins/container/RSDF.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'module/plugins/container/RSDF.py') diff --git a/module/plugins/container/RSDF.py b/module/plugins/container/RSDF.py index 9c57c8ddb..0c43f0e6c 100644 --- a/module/plugins/container/RSDF.py +++ b/module/plugins/container/RSDF.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +from __future__ import with_statement + import base64 import binascii import re @@ -10,7 +12,7 @@ from module.utils import fs_encode class RSDF(Container): __name__ = "RSDF" - __version__ = "0.23" + __version__ = "0.24" __pattern__ = r'.+\.rsdf' -- cgit v1.2.3