diff options
Diffstat (limited to 'module/plugins/container/CCF.py')
| -rw-r--r-- | module/plugins/container/CCF.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/module/plugins/container/CCF.py b/module/plugins/container/CCF.py index 563eaef6d..2cafb2977 100644 --- a/module/plugins/container/CCF.py +++ b/module/plugins/container/CCF.py @@ -8,19 +8,19 @@ import urllib2 import MultipartPostHandler from module.plugins.internal.Container import Container -from module.plugins.internal.utils import encode, fs_join +from module.plugins.internal.misc import encode, fsjoin class CCF(Container): __name__ = "CCF" __type__ = "container" - __version__ = "0.27" + __version__ = "0.28" __status__ = "testing" __pattern__ = r'.+\.ccf$' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_subfolder" , "bool", "Save package to subfolder" , True), - ("subfolder_per_package", "bool", "Create a subfolder for each package", True)] + __config__ = [("activated" , "bool" , "Activated" , True ), + ("use_premium" , "bool" , "Use premium account if available", True ), + ("folder_per_package", "Default;Yes;No", "Create folder for each package" , "Default")] __description__ = """CCF container decrypter plugin""" __license__ = "GPLv3" @@ -29,7 +29,7 @@ class CCF(Container): def decrypt(self, pyfile): - fs_filename = encode(pyfile.url.strip()) + fs_filename = encode(pyfile.url) opener = urllib2.build_opener(MultipartPostHandler.MultipartPostHandler) dlc_content = opener.open('http://service.jdownloader.net/dlcrypt/getDLC.php', @@ -38,7 +38,7 @@ class CCF(Container): 'upload' : open(fs_filename, "rb")}).read() dl_folder = self.pyload.config.get("general", "download_folder") - dlc_file = fs_join(dl_folder, "tmp_%s.dlc" % pyfile.name) + dlc_file = fsjoin(dl_folder, "tmp_%s.dlc" % pyfile.name) try: dlc = re.search(r'<dlc>(.+)</dlc>', dlc_content, re.S).group(1).decode('base64') |