diff options
| author |  Koch Michael <charlie8913@gmail.com>
| 2014-05-31 22:31:31 +0200 |
|---|---|---|
| committer | Koch Michael <charlie8913@gmail.com>
| 2014-05-31 22:31:31 +0200 |
| commit | 78acb65ce09efdbdd9a3db2358b37ad26b965335 (patch) | |
| tree | 8e562d21eb74e05e4f68f060df2bc7f23f0511f4 | |
| parent | Fix cookie issues (diff) | |
| parent | Fix downloads on UploadedTo (diff) | |
| download | pyload-78acb65ce09efdbdd9a3db2358b37ad26b965335.tar.xz | |
Merge branch 'fix-uploadedto'
| -rw-r--r-- | pyload/plugins/accounts/UploadedTo.py | 4 | ||||
| -rw-r--r-- | pyload/plugins/hoster/UploadedTo.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pyload/plugins/accounts/UploadedTo.py b/pyload/plugins/accounts/UploadedTo.py index 02f31c544..84283ee54 100644 --- a/pyload/plugins/accounts/UploadedTo.py +++ b/pyload/plugins/accounts/UploadedTo.py @@ -25,7 +25,7 @@ from module.plugins.Account import Account class UploadedTo(Account): __name__ = "UploadedTo" - __version__ = "0.26" + __version__ = "0.27" __type__ = "account" __description__ = """Uploaded.to account plugin""" __author_name__ = "mkaay" @@ -42,7 +42,7 @@ class UploadedTo(Account): raw_traffic = re.search(r'<th colspan="2"><b class="cB">([^<]+)', html).group(1).replace('.', '') raw_valid = re.search(r"<td>Duration:</td>\s*<th>([^<]+)", html, re.MULTILINE).group(1).strip() - traffic = int(self.parseTraffic(raw_traffic)) + traffic = int(self.parseTraffic(raw_traffic)) * 1024 if raw_valid == "unlimited": validuntil = -1 diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py index 6d17bcbd9..5dc368e20 100644 --- a/pyload/plugins/hoster/UploadedTo.py +++ b/pyload/plugins/hoster/UploadedTo.py @@ -146,10 +146,10 @@ class UploadedTo(Hoster): self.handleFree() def handlePremium(self): - info = self.account.getAccountInfo(self.user, True) + self.account.getAccountInfo(True) self.logDebug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__, - "left": info["trafficleft"] / 1024 / 1024}) - if int(self.data[1]) / 1024 > info["trafficleft"]: + "left": self.account.trafficleft / 1024 / 1024}) + if int(self.data[1]) / 1024 > self.account.trafficleft: self.logInfo(_("%s: Not enough traffic left" % self.__name__)) self.account.empty(self.user) self.resetAccount() |