Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 14 insertions, 13 deletions

diff --git a/module/plugins/accounts/TurbobitNet.py b/module/plugins/accounts/TurbobitNet.py
index 010fbc270..206e7874f 100644
--- a/module/plugins/accounts/TurbobitNet.py
+++ b/module/plugins/accounts/TurbobitNet.py
@@ -3,21 +3,23 @@
 import re
 import time
 
-from module.plugins.Account import Account
+from module.plugins.internal.Account import Account
+from module.plugins.internal.Plugin import set_cookie
 
 
 class TurbobitNet(Account):
     __name__    = "TurbobitNet"
     __type__    = "account"
-    __version__ = "0.02"
+    __version__ = "0.05"
+    __status__  = "testing"
 
     __description__ = """TurbobitNet account plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    def loadAccountInfo(self, user, req):
-        html = req.load("http://turbobit.net")
+    def parse_info(self, user, password, data, req):
+        html = self.load("http://turbobit.net")
 
         m = re.search(r'<u>Turbo Access</u> to ([\d.]+)', html)
         if m:
@@ -27,17 +29,16 @@ class TurbobitNet(Account):
             premium = False
             validuntil = -1
 
-        return {"premium": premium, "trafficleft": -1, "validuntil": validuntil}
+        return {'premium': premium, 'trafficleft': -1, 'validuntil': validuntil}
 
 
-    def login(self, user, data, req):
-        req.cj.setCookie("turbobit.net", "user_lang", "en")
+    def login(self, user, password, data, req):
+        set_cookie(req.cj, "turbobit.net", "user_lang", "en")
 
-        html = req.load("http://turbobit.net/user/login",
-                        post={"user[login]": user,
-                              "user[pass]": data['password'],
-                              "user[submit]": "Login"},
-                        decode=True)
+        html = self.load("http://turbobit.net/user/login",
+                         post={"user[login]" : user,
+                               "user[pass]"  : password,
+                               "user[submit]": "Login"})
 
         if not '<div class="menu-item user-name">' in html:
-            self.wrongPassword()
+            self.login_fail()