icyfiles, bayfiles by godofdream, alldebrid json api, zevera python 2.5 compat.

1 files changed, 26 insertions, 13 deletions

diff --git a/module/plugins/accounts/AlldebridCom.py b/module/plugins/accounts/AlldebridCom.py
index 4968e9bdd..f87a1c881 100644
--- a/module/plugins/accounts/AlldebridCom.py
+++ b/module/plugins/accounts/AlldebridCom.py
@@ -1,27 +1,40 @@
 from module.plugins.Account import Account

 import xml.dom.minidom as dom

+from BeautifulSoup import BeautifulSoup

 from time import time

+import re

 

 class AlldebridCom(Account):

     __name__ = "AlldebridCom"

-    __version__ = "0.1"

+    __version__ = "0.2"

     __type__ = "account"

     __description__ = """AllDebrid.com account plugin"""

     __author_name__ = ("Andy, Voigt")

     __author_mail__ = ("spamsales@online.de")

 

     def loadAccountInfo(self, user, req):

-		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)

-		account_info = {"validuntil": (time()+int(xml.getElementsByTagName("date")[0].childNodes[0].nodeValue)*86400),

-                        "trafficleft": -1}

-

-		return account_info

+        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:

+             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

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

+        return account_info

 

     def login(self, user, data, req):      

-		page = req.load("http://www.alldebrid.com/register/?action=login&login_login=%s&login_password=%s" % (user, data["password"]))

-		

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

-			self.wrongPassword()

+        page = req.load("http://www.alldebrid.com/register/?action=login&login_login=%s&login_password=%s" % (user, data["password"]))

+

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

+             self.wrongPassword()