Merge pull request #1 from pyload/stable

sync stable

1 files changed, 13 insertions, 16 deletions

diff --git a/module/plugins/hoster/MyfastfileCom.py b/module/plugins/hoster/MyfastfileCom.py
index 7471086fb..662638843 100644
--- a/module/plugins/hoster/MyfastfileCom.py
+++ b/module/plugins/hoster/MyfastfileCom.py
@@ -9,34 +9,31 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
 class MyfastfileCom(MultiHoster):
     __name__    = "MyfastfileCom"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
-    __pattern__ = r'http://(?:www\.)?\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/'
+    __pattern__ = r'http://\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/dl/'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
-    __description__ = """Myfastfile.com hoster plugin"""
+    __description__ = """Myfastfile.com multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
     def setup(self):
-        self.chunkLimit     = -1
-        self.resumeDownload = True
+        self.chunkLimit = -1
 
 
-    def handlePremium(self):
-        self.logDebug("Original URL: %s" % self.pyfile.url)
-
-        page = self.load('http://myfastfile.com/api.php',
+    def handlePremium(self, pyfile):
+        self.html = self.load('http://myfastfile.com/api.php',
                          get={'user': self.user, 'pass': self.account.getAccountData(self.user)['password'],
-                              'link': self.pyfile.url})
-        self.logDebug("JSON data: " + page)
-        page = json_loads(page)
-        if page['status'] != 'ok':
+                              'link': pyfile.url})
+        self.logDebug("JSON data: " + self.html)
+
+        self.html = json_loads(self.html)
+        if self.html['status'] != 'ok':
             self.fail(_("Unable to unrestrict link"))
-        self.link = page['link']
 
-        if self.link != self.pyfile.url:
-            self.logDebug("Unrestricted URL: " + self.link)
+        self.link = self.html['link']
 
 
 getInfo = create_getInfo(MyfastfileCom)