Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 9 insertions, 8 deletions

diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py
index c1612bb6a..81d880725 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireComFolder.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Crypter import Crypter
+from module.plugins.internal.Crypter import Crypter
 from module.plugins.hoster.MediafireCom import checkHTMLHeader
 from module.common.json_layer import json_loads
 
@@ -9,7 +9,8 @@ from module.common.json_layer import json_loads
 class MediafireComFolder(Crypter):
     __name__    = "MediafireComFolder"
     __type__    = "crypter"
-    __version__ = "0.14"
+    __version__ = "0.16"
+    __status__  = "testing"
 
     __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -26,27 +27,27 @@ class MediafireComFolder(Crypter):
 
     def decrypt(self, pyfile):
         url, result = checkHTMLHeader(pyfile.url)
-        self.logDebug("Location (%d): %s" % (result, url))
+        self.log_debug("Location (%d): %s" % (result, url))
 
         if result == 0:
-            # load and parse html
+            #: Load and parse html
             html = self.load(pyfile.url)
             m = re.search(self.LINK_PATTERN, html)
             if m:
-                # file page
+                #: File page
                 self.urls.append("http://www.mediafire.com/file/%s" % m.group(1))
             else:
-                # folder page
+                #: Folder page
                 m = re.search(self.FOLDER_KEY_PATTERN, html)
                 if m:
                     folder_key = m.group(1)
-                    self.logDebug("FOLDER KEY: %s" % folder_key)
+                    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.logInfo(json_resp)
+                    # self.log_info(json_resp)
                     if json_resp['response']['result'] == "Success":
                         for link in json_resp['response']['folder_info']['files']:
                             self.urls.append("http://www.mediafire.com/file/%s" % link['quickkey'])