From 5a679eeada699b74e29bf8947d25ae3e83289180 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 2 Oct 2010 22:14:08 +0200 Subject: improved accountmanager --- module/plugins/hoster/NetloadIn.py | 6 ++++++ module/plugins/hoster/RapidshareCom.py | 2 +- module/plugins/hoster/UploadedTo.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py index 2a1053fae..369cd9189 100644 --- a/module/plugins/hoster/NetloadIn.py +++ b/module/plugins/hoster/NetloadIn.py @@ -226,3 +226,9 @@ class NetloadIn(Hoster): self.download(url, cookies=True) + check = self.checkDownload({"empty": re.compile(r"^$")}) + + if check == "empty": + self.log.info(_("Downloaded File was empty")) + self.retry() + diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py index f7ee287bc..8123f5a65 100644 --- a/module/plugins/hoster/RapidshareCom.py +++ b/module/plugins/hoster/RapidshareCom.py @@ -149,7 +149,7 @@ class RapidshareCom(Hoster): def handlePremium(self): - info = self.account.getAccountInfo(self.account.getAccountData(self)[0]) + info = self.account.getAccountInfo(self.user, True) self.log.debug(_("%(name)s: Use Premium Account (%(left)sGB left)") % { "name" : self.__name__, "left": info["trafficleft"]/1000/1000 }) if self.api_data["size"] / 1024 > info["trafficleft"]: self.log.info(_("%s: Not enough traffic left" % self.__name__)) diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 70d71b493..933feab39 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -64,7 +64,7 @@ class UploadedTo(Hoster): # self.pyfile.name = self.get_file_name() if self.account: - info = self.account.getAccountInfo(self.account.getAccountData(self)[0]) + info = self.account.getAccountInfo(self.user, True) self.log.debug(_("%(name)s: Use Premium Account (%(left)sGB left)") % {"name" :self.__name__, "left" : info["trafficleft"]/1024/1024}) if self.api_data["size"]/1024 > info["trafficleft"]: self.log.info(_("%s: Not enough traffic left" % self.__name__)) -- cgit v1.2.3