From 54025794ebf707ba0c0f2840d5364b0b380d17a9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 18 Oct 2015 18:55:20 +0200 Subject: Update crypters --- module/plugins/crypter/MediafireComFolder.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'module/plugins/crypter/MediafireComFolder.py') diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py index 4ef330a3f..d9caf743d 100644 --- a/module/plugins/crypter/MediafireComFolder.py +++ b/module/plugins/crypter/MediafireComFolder.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- import re -from module.plugins.internal.Crypter import Crypter + +from module.plugins.internal.Crypter import Crypter, create_getInfo from module.plugins.hoster.MediafireCom import checkHTMLHeader -from module.common.json_layer import json_loads +from module.plugins.internal.utils import json class MediafireComFolder(Crypter): @@ -13,7 +14,7 @@ class MediafireComFolder(Crypter): __status__ = "testing" __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))' - __config__ = [("activated", "bool", "Activated", True), + __config__ = [("activated" , "bool", "Activated" , True), ("use_subfolder" , "bool", "Save package to subfolder" , True), ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)] @@ -44,7 +45,7 @@ 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", + 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})) @@ -58,3 +59,6 @@ class MediafireComFolder(Crypter): self.offline() else: self.urls.append(url) + + +getInfo = create_getInfo(MediafireComFolder) -- cgit v1.2.3