Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 16 insertions, 14 deletions

diff --git a/module/plugins/accounts/SimplydebridCom.py b/module/plugins/accounts/SimplydebridCom.py
index 24108eb0b..84c38227e 100644
--- a/module/plugins/accounts/SimplydebridCom.py
+++ b/module/plugins/accounts/SimplydebridCom.py
@@ -2,34 +2,36 @@
 
 import time
 
-from module.plugins.Account import Account
+from module.plugins.internal.Account import Account
 
 
 class SimplydebridCom(Account):
     __name__    = "SimplydebridCom"
     __type__    = "account"
-    __version__ = "0.11"
+    __version__ = "0.13"
+    __status__  = "testing"
 
     __description__ = """Simply-Debrid.com account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
-    def loadAccountInfo(self, user, req):
-        get_data = {'login': 2, 'u': self.loginname, 'p': self.password}
-        res = req.load("http://simply-debrid.com/api.php", get=get_data, decode=True)
+    def parse_info(self, user, password, data, req):
+        res = self.load("http://simply-debrid.com/api.php",
+                        get={'login': 2,
+                             'u'    : user,
+                             'p'    : password})
         data = [x.strip() for x in res.split(";")]
         if str(data[0]) != "1":
-            return {"premium": False}
+            return {'premium': False}
         else:
-            return {"trafficleft": -1, "validuntil": time.mktime(time.strptime(str(data[2]), "%d/%m/%Y"))}
+            return {'trafficleft': -1, 'validuntil': time.mktime(time.strptime(str(data[2]), "%d/%m/%Y"))}
 
 
-    def login(self, user, data, req):
-        self.loginname = user
-        self.password  = data['password']
-        get_data       = {'login': 1, 'u': self.loginname, 'p': self.password}
-
-        res = req.load("http://simply-debrid.com/api.php", get=get_data, decode=True)
+    def login(self, user, password, data, req):
+        res = self.load("https://simply-debrid.com/api.php",
+                        get={'login': 1,
+                             'u'    : user,
+                             'p'    : password})
         if res != "02: loggin success":
-            self.wrongPassword()
+            self.login_fail()