diff options
Diffstat (limited to 'module/plugins/crypter/MediafireComFolder.py')
| -rw-r--r-- | module/plugins/crypter/MediafireComFolder.py | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index 604d78687..b0e2e5e51 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -2,21 +2,20 @@ import re -from module.plugins.internal.Crypter import Crypter, create_getInfo -from module.plugins.internal.utils import json +from module.plugins.internal.Crypter import Crypter +from module.plugins.internal.misc import json class MediafireComFolder(Crypter): __name__ = "MediafireComFolder" __type__ = "crypter" - __version__ = "0.20" + __version__ = "0.21" __status__ = "testing" __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' - __config__ = [("activated" , "bool", "Activated" , True), - ("use_premium" , "bool", "Use premium account if available" , 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__ = """Mediafire.com folder decrypter plugin""" __license__ = "GPLv3" @@ -73,22 +72,20 @@ class MediafireComFolder(Crypter): folder_key = m.group(1) self.log_debug("FOLDER KEY: %s" % folder_key) - json_resp = json.loads(self.load("http://www.mediafire.com/api/folder/get_info.php", - get={'folder_key' : folder_key, - 'response_format': "json", - 'version' : 1})) - # self.log_info(json_resp) - if json_resp['response']['result'] == "Success": - for link in json_resp['response']['folder_info']['files']: + html = self.load("http://www.mediafire.com/api/folder/get_info.php", + get={'folder_key' : folder_key, + 'response_format': "json", + 'version' : 1}) + json_data = json.loads(html) + # self.log_info(json_data) + if json_data['response']['result'] == "Success": + for link in json_data['response']['folder_info']['files']: self.links.append("http://www.mediafire.com/file/%s" % link['quickkey']) else: - self.fail(json_resp['response']['message']) + self.fail(json_data['response']['message']) elif result is 1: self.offline() else: self.links.append(url) - - -getInfo = create_getInfo(MediafireComFolder) |