diff options
Diffstat (limited to 'module/plugins/container/CCF.py')
| -rw-r--r-- | module/plugins/container/CCF.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 7e0e962b3..f2cb4b2c2 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -2,18 +2,19 @@ from __future__ import with_statement -import MultipartPostHandler import re import urllib2 +import MultipartPostHandler + from module.plugins.internal.Container import Container -from module.utils import fs_encode, save_join as fs_join +from module.plugins.internal.utils import encode, fs_join class CCF(Container): __name__ = "CCF" __type__ = "container" - __version__ = "0.25" + __version__ = "0.26" __status__ = "testing" __pattern__ = r'.+\.ccf$' @@ -26,7 +27,7 @@ class CCF(Container): def decrypt(self, pyfile): - fs_filename = fs_encode(pyfile.url.strip()) + fs_filename = encode(pyfile.url.strip()) opener = urllib2.build_opener(MultipartPostHandler.MultipartPostHandler) dlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', @@ -34,8 +35,8 @@ class CCF(Container): 'filename': "test.ccf", 'upload' : open(fs_filename, "rb")}).read() - download_folder = self.pyload.config.get("general", "download_folder") - dlc_file = fs_join(download_folder, "tmp_%s.dlc" % pyfile.name) + dl_folder = self.pyload.config.get("general", "download_folder") + dlc_file = fs_join(dl_folder, "tmp_%s.dlc" % pyfile.name) try: dlc = re.search(r'<dlc>(.+)</dlc>', dlc_content, re.S).group(1).decode('base64') |