From 64b48b5cae505aa0bab310687cf2f6c9f48057f1 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 23 Jan 2015 00:51:00 +0100 Subject: Improve container __pattern__ --- module/plugins/container/CCF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index bca535175..c6e642cca 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -16,9 +16,9 @@ from module.utils import save_join class CCF(Container): __name__ = "CCF" - __version__ = "0.20" + __version__ = "0.21" - __pattern__ = r'.+\.ccf' + __pattern__ = r'.+\.ccf$' __description__ = """CCF container decrypter plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From cb9e67a5437ddfafd6a93f5a208b9faf3f2d5575 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 29 Jan 2015 15:56:57 +0100 Subject: Some file encoding fixup + optimizations --- module/plugins/container/CCF.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index c6e642cca..e7ad8f761 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -11,12 +11,13 @@ from urllib2 import build_opener from MultipartPostHandler import MultipartPostHandler from module.plugins.Container import Container -from module.utils import save_join +from module.utils import fs_encode, save_join class CCF(Container): __name__ = "CCF" - __version__ = "0.21" + __type__ = "container" + __version__ = "0.22" __pattern__ = r'.+\.ccf$' @@ -26,17 +27,17 @@ class CCF(Container): def decrypt(self, pyfile): - infile = pyfile.url.replace("\n", "") - + file = fs_encode(pyfile.url.strip()) opener = build_opener(MultipartPostHandler) - params = {"src": "ccf", - "filename": "test.ccf", - "upload": open(infile, "rb")} - tempdlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', params).read() + + tempdlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', + {'src' : "ccf", + 'filename': "test.ccf", + 'upload' : open(file, "rb")}).read() download_folder = self.config['general']['download_folder'] + tempdlc_name = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) - tempdlc_name = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) with open(tempdlc_name, "w") as tempdlc: tempdlc.write(re.search(r'(.*)', tempdlc_content, re.S).group(1)) -- cgit v1.2.3 From 193cb8dbe1b24c24fb919461f16b2215e85da739 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 3 Feb 2015 16:09:13 +0100 Subject: Update container plugins --- module/plugins/container/CCF.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index e7ad8f761..452b9bb65 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -4,8 +4,6 @@ from __future__ import with_statement import re -from os import makedirs -from os.path import exists from urllib2 import build_opener from MultipartPostHandler import MultipartPostHandler @@ -17,28 +15,35 @@ from module.utils import fs_encode, save_join class CCF(Container): __name__ = "CCF" __type__ = "container" - __version__ = "0.22" + __version__ = "0.23" __pattern__ = r'.+\.ccf$' __description__ = """CCF container decrypter plugin""" __license__ = "GPLv3" - __authors__ = [("Willnix", "Willnix@pyload.org")] + __authors__ = [("Willnix", "Willnix@pyload.org"), + ("Walter Purcaro", "vuolter@gmail.com")] def decrypt(self, pyfile): file = fs_encode(pyfile.url.strip()) opener = build_opener(MultipartPostHandler) - tempdlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', - {'src' : "ccf", - 'filename': "test.ccf", - 'upload' : open(file, "rb")}).read() + dlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', + {'src' : "ccf", + 'filename': "test.ccf", + 'upload' : open(file, "rb")}).read() download_folder = self.config['general']['download_folder'] - tempdlc_name = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) + dlc_file = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) - with open(tempdlc_name, "w") as tempdlc: - tempdlc.write(re.search(r'(.*)', tempdlc_content, re.S).group(1)) + try: + dlc = re.search(r'(.+)', dlc_content, re.S).group(1).decode('base64') - self.urls = [tempdlc_name] + except AttributeError: + self.fail(_("Container is corrupted")) + + with open(dlc_file, "w") as tempdlc: + tempdlc.write(dlc) + + self.urls = [dlc_file] -- cgit v1.2.3 From c039d5822c4c53661813b6fd8e2252a3b633532e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 27 Feb 2015 04:39:45 +0100 Subject: [container] Code cosmetics --- module/plugins/container/CCF.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 452b9bb65..79d7879a7 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -26,13 +26,13 @@ class CCF(Container): def decrypt(self, pyfile): - file = fs_encode(pyfile.url.strip()) - opener = build_opener(MultipartPostHandler) + fs_filename = fs_encode(pyfile.url.strip()) + opener = build_opener(MultipartPostHandler) dlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', {'src' : "ccf", 'filename': "test.ccf", - 'upload' : open(file, "rb")}).read() + 'upload' : open(fs_filename, "rb")}).read() download_folder = self.config['general']['download_folder'] dlc_file = save_join(download_folder, "tmp_%s.dlc" % pyfile.name) -- cgit v1.2.3 From 1ef93e913238275f7657d496ba3d2e7eeb5a30a2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 1 May 2015 01:06:01 +0200 Subject: Use 'import' instead 'from' --- module/plugins/container/CCF.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'module/plugins/container/CCF.py') diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 79d7879a7..235d5dc1d 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -2,11 +2,9 @@ from __future__ import with_statement +import MultipartPostHandler import re - -from urllib2 import build_opener - -from MultipartPostHandler import MultipartPostHandler +import urllib2 from module.plugins.Container import Container from module.utils import fs_encode, save_join @@ -27,7 +25,7 @@ class CCF(Container): def decrypt(self, pyfile): fs_filename = fs_encode(pyfile.url.strip()) - opener = build_opener(MultipartPostHandler) + opener = urllib2.build_opener(MultipartPostHandler.MultipartPostHandler) dlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', {'src' : "ccf", -- cgit v1.2.3