Merge branch 'stable' of git://github.com/pyload/pyload into stable

3 files changed, 79 insertions, 13 deletions

diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py
index 7d4d245ba..beaddeac9 100644
--- a/module/plugins/accounts/AlldebridCom.py
+++ b/module/plugins/accounts/AlldebridCom.py
@@ -17,20 +17,20 @@ class AlldebridCom(Account):
         data = self.getAccountData(user)

         page = req.load("http://www.alldebrid.com/account/")

         soup=BeautifulSoup(page)

-		#Try to parse expiration date directly from the control panel page (better accuracy)        

+        #Try to parse expiration date directly from the control panel page (better accuracy)        

         try:

-             time_text=soup.find('div',attrs={'class':'remaining_time_text'}).strong.string

-             self.log.debug("Account expires in: %s" % time_text)

-             p = re.compile('\d+')

-             exp_data=p.findall(time_text)

-             exp_time=time()+int(exp_data[0])*24*60*60+int(exp_data[1])*60*60+(int(exp_data[2])-1)*60

-		#Get expiration date from API

+            time_text=soup.find('div',attrs={'class':'remaining_time_text'}).strong.string

+            self.log.debug("Account expires in: %s" % time_text)

+            p = re.compile('\d+')

+            exp_data=p.findall(time_text)

+            exp_time=time()+int(exp_data[0])*24*60*60+int(exp_data[1])*60*60+(int(exp_data[2])-1)*60

+        #Get expiration date from API

         except:

-             data = self.getAccountData(user)

-             page = req.load("http://www.alldebrid.com/api.php?action=info_user&login=%s&pw=%s" %  (user, data["password"]))

-             self.log.debug(page)

-             xml = dom.parseString(page)

-             exp_time=time()+int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue)*86400

+            data = self.getAccountData(user)

+            page = req.load("http://www.alldebrid.com/api.php?action=info_user&login=%s&pw=%s" %  (user, data["password"]))

+            self.log.debug(page)

+            xml = dom.parseString(page)

+            exp_time=time()+int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue)*86400

         account_info = {"validuntil": exp_time, "trafficleft": -1}

         return account_info

 

@@ -40,7 +40,7 @@ class AlldebridCom(Account):
         page = req.load("http://www.alldebrid.com/register/?%s" % (urlparams))
 

         if "This login doesn't exist" in page:

-             self.wrongPassword()

+            self.wrongPassword()

              
         if "The password is not valid" in page:
             self.wrongPassword()
diff --git a/module/plugins/accounts/CyberlockerCh.py b/module/plugins/accounts/CyberlockerCh.py
new file mode 100644
index 000000000..31e0c3e24
--- /dev/null
+++ b/module/plugins/accounts/CyberlockerCh.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from module.plugins.internal.XFSPAccount import XFSPAccount
+from module.plugins.internal.SimpleHoster import parseHtmlForm
+
+class CyberlockerCh(XFSPAccount):
+    __name__ = "CyberlockerCh"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """CyberlockerCh account plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    MAIN_PAGE = "http://cyberlocker.ch/"
+
+    def login(self, user, data, req):
+        html = req.load(self.MAIN_PAGE + 'login.html', decode = True)
+
+        action, inputs = parseHtmlForm('name="FL"', html)
+        if not inputs:
+            inputs = {"op": "login",
+                      "redirect": self.MAIN_PAGE}
+
+        inputs.update({"login": user,
+                       "password": data['password']})
+
+        # Without this a 403 Forbidden is returned
+        req.http.lastURL = self.MAIN_PAGE + 'login.html'
+        html = req.load(self.MAIN_PAGE, post = inputs, decode = True)
+
+        if 'Incorrect Login or Password' in html or '>Error<' in html:
+            self.wrongPassword()
diff --git a/module/plugins/accounts/DebridItaliaCom.py b/module/plugins/accounts/DebridItaliaCom.py
new file mode 100644
index 000000000..d68f1c8a8
--- /dev/null
+++ b/module/plugins/accounts/DebridItaliaCom.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+import re
+import _strptime
+import time
+
+from module.plugins.Account import Account
+
+
+class DebridItaliaCom(Account):
+    __name__ = "DebridItaliaCom"
+    __version__ = "0.1"
+    __type__ = "account"
+    __description__ = """debriditalia.com account plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    WALID_UNTIL_PATTERN = r"Premium valid till: (?P<D>[^|]+) \|"
+
+    def loadAccountInfo(self, user, req):
+        if 'Account premium not activated' in self.html:
+            return {"premium": False, "validuntil": None, "trafficleft": None}
+
+        m = re.search(self.WALID_UNTIL_PATTERN, self.html)
+        if m:
+            validuntil = int(time.mktime(time.strptime(m.group('D'), "%d/%m/%Y %H:%M")))
+            return {"premium": True, "validuntil": validuntil, "trafficleft": -1}
+        else:
+            self.logError('Unable to retrieve account information - Plugin may be out of date')
+
+    def login(self, user, data, req):
+        self.html = req.load("http://debriditalia.com/login.php",
+                             get={"u": user, "p": data["password"]})
+        if 'NO' in self.html:
+            self.wrongPassword()