diff options
author | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-10-04 04:29:58 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@users.noreply.github.com> | 2015-10-04 04:29:58 +0200 |
commit | 1c7d9e55ffbfc9204c9e9246d9cc64806fa38326 (patch) | |
tree | 49fff3f3b5b2c036c99c1422b9d0153a6c80f0cd /module/plugins/internal/Hoster.py | |
parent | Fix https://github.com/pyload/pyload/issues/1911#issuecomment-145026557 (diff) | |
download | pyload-1c7d9e55ffbfc9204c9e9246d9cc64806fa38326.tar.xz |
Fixpack (2)
Diffstat (limited to 'module/plugins/internal/Hoster.py')
-rw-r--r-- | module/plugins/internal/Hoster.py | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py index 86b684414..b0458ca95 100644 --- a/module/plugins/internal/Hoster.py +++ b/module/plugins/internal/Hoster.py @@ -13,7 +13,7 @@ from module.utils import fs_decode, fs_encode, save_join as fs_join, save_path a class Hoster(Base): __name__ = "Hoster" __type__ = "hoster" - __version__ = "0.35" + __version__ = "0.36" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -93,19 +93,6 @@ class Hoster(Base): raise Fail(e) - def restart(self, msg="", premium=True): - if not msg: - msg = _("Simple restart") if premium else _("Fallback to free download") - - if not premium: - if self.premium: - self.rst_free = True - else: - self.fail("%s | %s" % (msg, _("Download was already free"))) - - raise Retry(encode(msg)) #@TODO: Remove `encode` in 0.4.10 - - @check_abort def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=True): """ @@ -291,8 +278,10 @@ class Hoster(Base): return True else: - size = self.pyfile.size / 1024 #@TODO: Remove in 0.4.10 - self.log_info(_("Filesize: %s KiB, Traffic left for user %s: %s KiB") % (size, self.account.user, traffic)) #@TODO: Rewrite in 0.4.10 + #@TODO: Rewrite in 0.4.10 + size = self.pyfile.size / 1024 + self.log_info(_("Filesize: %s KiB") % size, + _("Traffic left for user %s: %s KiB") % (self.account.user, traffic)) return size <= traffic |