diff options
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/Account.py | 1 | ||||
| -rw-r--r-- | module/plugins/internal/Base.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/Hoster.py | 12 | ||||
| -rw-r--r-- | module/plugins/internal/Plugin.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 2 |
5 files changed, 14 insertions, 9 deletions
diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py index ec226956f..c63d182d9 100644 --- a/module/plugins/internal/Account.py +++ b/module/plugins/internal/Account.py @@ -68,6 +68,7 @@ class Account(Plugin): log = getattr(self.pyload.log, level) msg = u" | ".join(decode(a).strip() for a in messages if a) + #: Hide any password try: msg = msg.replace(self.info['login']['password'], "**********") except Exception: diff --git a/module/plugins/internal/Base.py b/module/plugins/internal/Base.py index 3d0bed791..47111ca8e 100644 --- a/module/plugins/internal/Base.py +++ b/module/plugins/internal/Base.py @@ -105,6 +105,7 @@ class Base(Plugin): log = getattr(self.pyload.log, level) msg = u" | ".join(decode(a).strip() for a in messages if a) + #: Hide any password try: msg = msg.replace(self.account.info['login']['password'], "**********") except Exception: @@ -253,7 +254,7 @@ class Base(Plugin): self.log_debug("Plugin status: " + self.__status__) if self.__status__ is "broken": - self.fail(_("Plugin is temporarily unavailable")) + self.abort(_("Plugin is temporarily unavailable")) elif self.__status__ is "testing": self.log_warning(_("Plugin may be unstable")) @@ -268,7 +269,8 @@ class Base(Plugin): self._initialize() self._setup() - # self.pyload.hookManager.downloadPreparing(self.pyfile) #@TODO: Recheck in 0.4.10 + #@TODO: Enable in 0.4.10 + # self.pyload.hookManager.downloadPreparing(self.pyfile) # self.check_status() self.pyfile.setStatus("starting") diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py index 2e70517d3..6d88732ea 100644 --- a/module/plugins/internal/Hoster.py +++ b/module/plugins/internal/Hoster.py @@ -88,7 +88,8 @@ class Hoster(Base): self._initialize() self._setup() - # self.pyload.hookManager.downloadPreparing(self.pyfile) #@TODO: Recheck in 0.4.10 + #@TODO: Enable in 0.4.10 + # self.pyload.hookManager.downloadPreparing(self.pyfile) # self.check_status() self.check_duplicates() @@ -120,14 +121,15 @@ class Hoster(Base): self.pyload.hookManager.dispatchEvent("download_processed", self.pyfile) try: - unfinished = any(pyfile.hasStatus('queued') for pyfile in pypack.getChildren() - if pyfile.id is not self.pyfile.id) + unfinished = any(fdata['status'] is 3 for fid, fdata in pypack.getChildren().items() + if fid is not self.pyfile.id) if unfinished: return self.pyload.hookManager.dispatchEvent("package_processed", pypack) - failed = any(pyfile.status in (1, 6, 8, 9, 14) for pyfile in pypack.getChildren()) + failed = any(fdata['status'] in (1, 6, 8, 9, 14) + for fid, fdata in pypack.getChildren().items()) if not failed: return @@ -149,7 +151,7 @@ class Hoster(Base): maxredirs = max(redirect, 1) elif redirect: - maxredirs = self.pyload.api.getConfigValue("UserAgentSwitcher", "maxredirs", "plugin") or maxredirs + maxredirs = int(self.pyload.api.getConfigValue("UserAgentSwitcher", "maxredirs", "plugin")) or maxredirs #@TODO: Remove `int` in 0.4.10 for i in xrange(maxredirs): self.log_debug("Redirect #%d to: %s" % (i, url)) diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py index 79370a975..71137e496 100644 --- a/module/plugins/internal/Plugin.py +++ b/module/plugins/internal/Plugin.py @@ -206,7 +206,7 @@ class Plugin(object): req.http.c.setopt(pycurl.FOLLOWLOCATION, 1) elif type(redirect) is int: - maxredirs = self.pyload.api.getConfigValue("UserAgentSwitcher", "maxredirs", "plugin") or 5 + maxredirs = int(self.pyload.api.getConfigValue("UserAgentSwitcher", "maxredirs", "plugin")) or 5 #@TODO: Remove `int` in 0.4.10 req.http.c.setopt(pycurl.MAXREDIRS, maxredirs) #@TODO: Move to network in 0.4.10 diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index b98ac4d76..97d7a660a 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -148,7 +148,7 @@ class SimpleCrypter(Crypter): def handle_direct(self, pyfile): - maxredirs = self.pyload.api.getConfigValue("UserAgentSwitcher", "maxredirs", "plugin") or 5 + maxredirs = int(self.pyload.api.getConfigValue("UserAgentSwitcher", "maxredirs", "plugin")) or 5 #@TODO: Remove `int` in 0.4.10 redirect = None for i in xrange(maxredirs): |