Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 22 insertions, 22 deletions

diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py
index 7d061ec2d..df3b5db51 100644
--- a/module/plugins/accounts/PremiumizeMe.py
+++ b/module/plugins/accounts/PremiumizeMe.py
@@ -1,49 +1,49 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.Account import Account
-
 from module.common.json_layer import json_loads
+from module.plugins.internal.Account import Account
 
 
 class PremiumizeMe(Account):
     __name__    = "PremiumizeMe"
     __type__    = "account"
-    __version__ = "0.13"
+    __version__ = "0.19"
+    __status__  = "testing"
 
     __description__ = """Premiumize.me account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Florian Franzen", "FlorianFranzen@gmail.com")]
 
 
-    def loadAccountInfo(self, user, req):
-        # Get user data from premiumize.me
-        status = self.getAccountStatus(user, req)
-        self.logDebug(status)
+    def parse_info(self, user, password, data, req):
+        #: Get user data from premiumize.me
+        status = self.get_account_status(user, password)
+        self.log_debug(status)
 
-        # Parse account info
-        account_info = {"validuntil": float(status['result']['expires']),
-                        "trafficleft": max(0, status['result']['trafficleft_bytes'] / 1024)}  #@TODO: Remove `/ 1024` in 0.4.10
+        #: Parse account info
+        account_info = {'validuntil': float(status['result']['expires']),
+                        'trafficleft': max(0, status['result']['trafficleft_bytes'] / 1024)}  #@TODO: Remove `/ 1024` in 0.4.10
 
-        if status['result']['type'] == 'free':
-            account_info['premium'] = False
+        if status['result']['type'] != 'free':
+            account_info['premium'] = True
 
         return account_info
 
 
-    def login(self, user, data, req):
-        # Get user data from premiumize.me
-        status = self.getAccountStatus(user, req)
+    def login(self, user, password, data, req):
+        #: Get user data from premiumize.me
+        status = self.get_account_status(user, password)
 
-        # Check if user and password are valid
+        #: Check if user and password are valid
         if status['status'] != 200:
-            self.wrongPassword()
+            self.login_fail()
 
 
-    def getAccountStatus(self, user, req):
-        # Use premiumize.me API v1 (see https://secure.premiumize.me/?show=api)
-        # to retrieve account info and return the parsed json answer
-        answer = req.load("https://api.premiumize.me/pm-api/v1.php",
+    def get_account_status(self, user, password):
+        #: Use premiumize.me API v1 (see https://secure.premiumize.me/?show=api)
+        #: To retrieve account info and return the parsed json answer
+        answer = self.load("http://api.premiumize.me/pm-api/v1.php",  #@TODO: Revert to `https` in 0.4.10
                            get={'method'       : "accountstatus",
                                 'params[login]': user,
-                                'params[pass]' : self.getAccountData(user)['password']})
+                                'params[pass]' : password})
         return json_loads(answer)