From e655d860882fff63160098f063fc3e4c9b8c0ba5 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 12 Aug 2010 19:42:46 +0200 Subject: web if acc settings --- module/plugins/accounts/UploadedTo.py | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'module/plugins/accounts/UploadedTo.py') diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py index d2aa22b22..926f91255 100644 --- a/module/plugins/accounts/UploadedTo.py +++ b/module/plugins/accounts/UploadedTo.py @@ -30,22 +30,25 @@ class UploadedTo(Account): __author_mail__ = ("mkaay@mkaay.de") def getAccountInfo(self, user): - data = None - for account in self.accounts.items(): - if account[0] == user: - data = account[1] - if not data: - return - req = self.core.requestFactory.getRequest(self.__name__, user) - html = req.load("http://uploaded.to/", cookies=True) - raw_traffic = re.search(r"Traffic left: (.*?)", html).group(1) - raw_valid = re.search(r"Valid until: (.*?)", html).group(1) - traffic = int(self.parseTraffic(raw_traffic)) - validuntil = int(mktime(strptime(raw_valid.strip(), "%d-%m-%Y %H:%M"))) - out = Account.getAccountInfo(self, user) - tmp = {"login":user, "validuntil":validuntil, "trafficleft":traffic, "type":self.__name__} - out.update(tmp) - return out + try: + data = None + for account in self.accounts.items(): + if account[0] == user: + data = account[1] + if not data: + return + req = self.core.requestFactory.getRequest(self.__name__, user) + html = req.load("http://uploaded.to/", cookies=True) + raw_traffic = re.search(r"Traffic left: (.*?)", html).group(1) + raw_valid = re.search(r"Valid until: (.*?)", html).group(1) + traffic = int(self.parseTraffic(raw_traffic)) + validuntil = int(mktime(strptime(raw_valid.strip(), "%d-%m-%Y %H:%M"))) + out = Account.getAccountInfo(self, user) + tmp = {"login":user, "validuntil":validuntil, "trafficleft":traffic, "type":self.__name__} + out.update(tmp) + return out + except: + return Account.getAccountInfo(self, user) def login(self, user, data): req = self.core.requestFactory.getRequest(self.__name__, user) -- cgit v1.2.3