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

2 files changed, 75 insertions, 159 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()

diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py
index 65d1d0bc2..61a66cd89 100644
--- a/module/plugins/accounts/ZeveraCom.py
+++ b/module/plugins/accounts/ZeveraCom.py
@@ -1,146 +1,49 @@
-# -*- coding: utf-8 -*-

-from module.plugins.Account import Account

-

-import re

-from time import mktime, strptime

-

-class ZeveraCom(Account):

-    __name__ = "ZeveraCom"

-    __version__ = "0.20"

-    __type__ = "account"

-    __description__ = """Zevera.com account plugin"""

-    __author_name__ = ("zoidberg")

-    __author_mail__ = ("zoidberg@mujmail.cz")    

-    

-    def loadAccountInfo(self, user, req):       

-        data = self.getAPIData(req)

-        if data == "No traffic":

-            account_info = {"trafficleft": 0, "validuntil": 0, "premium": False}

-        else:

-            account_info = {

-                "trafficleft": int(data['availabletodaytraffic']) * 1024,

-                "validuntil": mktime(strptime(data['endsubscriptiondate'],"%Y/%m/%d %H:%M:%S")),

-                "premium": True         

-            }

-        return account_info

-

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

-        self.loginname = user

-        self.password = data["password"]

-        if self.getAPIData(req) == "No traffic":

-            self.wrongPassword()

-            

-    def getAPIData(self, req, just_header = False, **kwargs):

-        get_data = {

-            'cmd': 'accountinfo',

-            'login': self.loginname,

-            'pass': self.password

-        }

-        get_data.update(kwargs)

-

-        response = req.load("http://www.zevera.com/jDownloader.ashx", get = get_data, decode = True, just_header = just_header) 

-        self.logDebug(response)

-

-        if ':' in response:

-            if not just_header:

-                response = response.replace(',','\n')

-            return {y.strip().lower(): z.strip() for y,z in [x.split(':',1) for x in response.splitlines() if ':' in x]}

-        else:

-            return response

-        

-       

-    

-    """

-    # BitAPI not used - defunct, probably abandoned by Zevera

-    

-    def loadAccountInfo(self, user, req):       

-        dataRet = self.loadAPIRequest(req)

-        account_info = {

-            "trafficleft": dataRet['AccountInfo']['AvailableTODAYTrafficForUseInMBytes'] * 1024,

-            "validuntil": -1 #dataRet['AccountInfo']['EndSubscriptionDate']            

-        }

-

-        return account_info

-

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

-        self.loginname = user

-        self.password = data["password"]

-        if self.loadAPIRequest(req, parse = False) == 'Login Error':

-            self.wrongPassword()

-    

-    

-    def loadAPIRequest(self, req, parse = True, **kwargs):    

-        get_dict = {

-            'cmd': 'download_request',

-            'login': self.loginname,

-            'pass': self.password

-        }

-        get_dict.update(kwargs)

-

-        response = req.load(self.api_url, get = get_dict, decode = True) 

-        self.logDebug(response)           

-        return self.parseAPIRequest(response) if parse else response

-        

-    def parseAPIRequest(self, api_response): 

-        

-        try:

-            arFields = iter(api_response.split('TAG BEGIN DATA#')[1].split('#END DATA')[0].split('#'))        

-    

-            retData = {

-                'VersionMajor': arFields.next(),

-                'VersionMinor': arFields.next(),

-                'ErrorCode': int(arFields.next()),

-                'ErrorMessage': arFields.next(),

-                'Update_Wait': arFields.next()

-            }

-            serverInfo = {

-                'DateTimeOnServer': mktime(strptime(arFields.next(),"%Y/%m/%d %H:%M:%S")),

-                'DAY_Traffic_LimitInMBytes': int(arFields.next())

-            }

-            accountInfo = {

-                'EndSubscriptionDate': mktime(strptime(arFields.next(),"%Y/%m/%d %H:%M:%S")),

-                'TrafficUsedInMBytesDayToday': int(arFields.next()),

-                'AvailableEXTRATrafficForUseInMBytes': int(arFields.next()),

-                'AvailableTODAYTrafficForUseInMBytes': int(arFields.next())

-            }

-            fileInfo = {

-                'FileID': arFields.next(),

-                'Title': arFields.next(),

-                'RealFileName': arFields.next(),

-                'FileNameOnServer': arFields.next(),

-                'StorageServerURL': arFields.next(),

-                'Token': arFields.next(),

-                'FileSizeInBytes': int(arFields.next()),

-                'StatusID': int(arFields.next())

-            }

-            progress = {

-                'BytesReceived': int(arFields.next()),

-                'TotalBytesToReceive': int(arFields.next()),

-                'Percentage': arFields.next(),

-                'StatusText': arFields.next(),

-                'ProgressText': arFields.next()

-            }

-            fileInfo.update({

-                'Progress': progress,

-                'FilePassword': arFields.next(),

-                'Keywords': arFields.next(),

-                'ImageURL4Download': arFields.next(),

-                'CategoryID': arFields.next(),

-                'CategoryText': arFields.next(),

-                'Notes': arFields.next()

-            })

-            retData.update({

-                'ServerInfo': serverInfo,

-                'AccountInfo': accountInfo,

-                'FileInfo': fileInfo

-            })

-            

-            #self.infos[self.loginname]['trafficleft'] = accountInfo['AvailableTODAYTrafficForUseInMBytes'] * 1024

-        

-        except Exception, e:

-            self.logError(e)

-            return None    

-        

-        self.logDebug(retData)

-        return retData

-    """ 
\ No newline at end of file
+# -*- coding: utf-8 -*-
+from module.plugins.Account import Account
+
+import re
+from time import mktime, strptime
+
+class ZeveraCom(Account):
+    __name__ = "ZeveraCom"
+    __version__ = "0.21"
+    __type__ = "account"
+    __description__ = """Zevera.com account plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")    
+    
+    def loadAccountInfo(self, user, req):       
+        data = self.getAPIData(req)
+        if data == "No traffic":
+            account_info = {"trafficleft": 0, "validuntil": 0, "premium": False}
+        else:
+            account_info = {
+                "trafficleft": int(data['availabletodaytraffic']) * 1024,
+                "validuntil": mktime(strptime(data['endsubscriptiondate'],"%Y/%m/%d %H:%M:%S")),
+                "premium": True         
+            }
+        return account_info
+
+    def login(self, user, data, req):
+        self.loginname = user
+        self.password = data["password"]
+        if self.getAPIData(req) == "No traffic":
+            self.wrongPassword()
+            
+    def getAPIData(self, req, just_header = False, **kwargs):
+        get_data = {
+            'cmd': 'accountinfo',
+            'login': self.loginname,
+            'pass': self.password
+        }
+        get_data.update(kwargs)
+
+        response = req.load("http://www.zevera.com/jDownloader.ashx", get = get_data, decode = True, just_header = just_header) 
+        self.logDebug(response)
+
+        if ':' in response:
+            if not just_header:
+                response = response.replace(',','\n')
+            return dict((y.strip().lower(), z.strip()) for (y,z) in [x.split(':',1) for x in response.splitlines() if ':' in x])
+        else:
+            return response
\ No newline at end of file