From 89c4db2674a289feea3c58de472385714d0ab5f8 Mon Sep 17 00:00:00 2001 From: Koch Michael Date: Sat, 31 May 2014 22:14:40 +0200 Subject: Fix wrong value for 'Traffic Left' for hoster UploadedTo --- pyload/plugins/accounts/UploadedTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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'([^<]+)', html).group(1).replace('.', '') raw_valid = re.search(r"Duration:\s*([^<]+)", 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 -- cgit v1.2.3 From cf621cfaa7d6cd1e6a80a3688bb56afb5592dfb0 Mon Sep 17 00:00:00 2001 From: Koch Michael Date: Sat, 31 May 2014 22:15:05 +0200 Subject: Fix downloads on UploadedTo getAccountInfo has no result value, instead it modifies properties (like trafficleft) of self.account. --- pyload/plugins/hoster/UploadedTo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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() -- cgit v1.2.3 From 172cd6b7da0232aec274d01c13cd73b1a5343b9e Mon Sep 17 00:00:00 2001 From: Koch Michael Date: Sun, 1 Jun 2014 20:47:33 +0200 Subject: Revert "Fix downloads on UploadedTo" This reverts commit cf621cfaa7d6cd1e6a80a3688bb56afb5592dfb0. --- pyload/plugins/hoster/UploadedTo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyload/plugins/hoster/UploadedTo.py b/pyload/plugins/hoster/UploadedTo.py index 5dc368e20..6d17bcbd9 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): - self.account.getAccountInfo(True) + info = self.account.getAccountInfo(self.user, True) self.logDebug("%(name)s: Use Premium Account (%(left)sGB left)" % {"name": self.__name__, - "left": self.account.trafficleft / 1024 / 1024}) - if int(self.data[1]) / 1024 > self.account.trafficleft: + "left": info["trafficleft"] / 1024 / 1024}) + if int(self.data[1]) / 1024 > info["trafficleft"]: self.logInfo(_("%s: Not enough traffic left" % self.__name__)) self.account.empty(self.user) self.resetAccount() -- cgit v1.2.3 From 0884b60890fce4b4e7641c0139a5e37d577a2c01 Mon Sep 17 00:00:00 2001 From: Koch Michael Date: Sun, 1 Jun 2014 20:50:34 +0200 Subject: Revert "Merge branch 'fix-uploadedto'" This reverts commit 78acb65ce09efdbdd9a3db2358b37ad26b965335, reversing changes made to 85526434c8ee9947715f76cd4de99e6839e1470c. --- pyload/plugins/accounts/UploadedTo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyload/plugins/accounts/UploadedTo.py b/pyload/plugins/accounts/UploadedTo.py index 84283ee54..02f31c544 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.27" + __version__ = "0.26" __type__ = "account" __description__ = """Uploaded.to account plugin""" __author_name__ = "mkaay" @@ -42,7 +42,7 @@ class UploadedTo(Account): raw_traffic = re.search(r'([^<]+)', html).group(1).replace('.', '') raw_valid = re.search(r"Duration:\s*([^<]+)", html, re.MULTILINE).group(1).strip() - traffic = int(self.parseTraffic(raw_traffic)) * 1024 + traffic = int(self.parseTraffic(raw_traffic)) if raw_valid == "unlimited": validuntil = -1 -- cgit v1.2.3 From 29d6ab2c5f5089f7e3f6c0de67a0212eacbbd068 Mon Sep 17 00:00:00 2001 From: Koch Michael Date: Sun, 1 Jun 2014 22:16:13 +0200 Subject: Show correct Value for 'Traffic left' in Accounts View afaik all the traffic values are in KiB, so the byte-value it has to be multiplied by 1024 for the accounts View to show it correctly --- pyload/web/app/scripts/helpers/formatSize.js | 8 ++++++-- pyload/web/app/templates/default/accounts/account.html | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pyload/web/app/scripts/helpers/formatSize.js b/pyload/web/app/scripts/helpers/formatSize.js index f72d62158..ddd62a1a5 100644 --- a/pyload/web/app/scripts/helpers/formatSize.js +++ b/pyload/web/app/scripts/helpers/formatSize.js @@ -3,7 +3,11 @@ define('helpers/formatSize', ['handlebars', 'utils/i18n'], function(Handlebars, 'use strict'; var sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB']; - function formatSize(bytes, options) { + function formatSize(bytes, options, multiplier) { + //multiplier 1024 is used for trafficleft because trafficleft is in KiB + if (typeof multiplier === 'number') + bytes = bytes * multiplier; + if (!bytes || bytes === 0) return '0 B'; if (bytes === -1) return i18n.gettext('not available'); @@ -17,4 +21,4 @@ define('helpers/formatSize', ['handlebars', 'utils/i18n'], function(Handlebars, Handlebars.registerHelper('formatSize', formatSize); return formatSize; -}); \ No newline at end of file +}); diff --git a/pyload/web/app/templates/default/accounts/account.html b/pyload/web/app/templates/default/accounts/account.html index 7039eae8c..65704db10 100644 --- a/pyload/web/app/templates/default/accounts/account.html +++ b/pyload/web/app/templates/default/accounts/account.html @@ -22,7 +22,7 @@ \ No newline at end of file + -- cgit v1.2.3