diff options
Diffstat (limited to 'module/plugins/accounts/PremiumizeMe.py')
| -rw-r--r-- | module/plugins/accounts/PremiumizeMe.py | 20 | 
1 files changed, 9 insertions, 11 deletions
diff --git a/module/plugins/accounts/PremiumizeMe.py b/module/plugins/accounts/PremiumizeMe.py index 696fdf88f..c5c712c52 100644 --- a/module/plugins/accounts/PremiumizeMe.py +++ b/module/plugins/accounts/PremiumizeMe.py @@ -1,22 +1,21 @@ -from module.plugins.Account   import Account +from module.plugins.Account import Account  from module.common.json_layer import json_loads +  class PremiumizeMe(Account):      __name__ = "PremiumizeMe"      __version__ = "0.11"      __type__ = "account"      __description__ = """Premiumize.Me account plugin""" -          __author_name__ = ("Florian Franzen")      __author_mail__ = ("FlorianFranzen@gmail.com")      def loadAccountInfo(self, user, req): -                  # Get user data from premiumize.me          status = self.getAccountStatus(user, req)          self.logDebug(status) -             +          # Parse account info          account_info = {"validuntil": float(status['result']['expires']),                          "trafficleft": max(0, status['result']['trafficleft_bytes'] / 1024)} @@ -27,18 +26,17 @@ class PremiumizeMe(Account):          return account_info      def login(self, user, data, req): -                  # Get user data from premiumize.me          status = self.getAccountStatus(user, req) -         +          # Check if user and password are valid          if status['status'] != 200:              self.wrongPassword() -          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?method=accountstatus¶ms[login]=%s¶ms[pass]=%s" % (user, self.accounts[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 = req.load( +            "https://api.premiumize.me/pm-api/v1.php?method=accountstatus¶ms[login]=%s¶ms[pass]=%s" % ( +            user, self.accounts[user]['password']))          return json_loads(answer) -          | 
