diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-11 03:44:46 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-11 03:44:46 +0200 |
| commit | 0624be22886c7543e95cee53a7d4b1bdc01bc3b1 (patch) | |
| tree | 18cbc2af8a46f0b753a0c3b999bc297a25596e26 /module/plugins/internal/SimpleHoster.py | |
| parent | [Plugin] Improve error tracing (diff) | |
| download | pyload-0624be22886c7543e95cee53a7d4b1bdc01bc3b1.tar.xz | |
[XFSAccount] Error handling support
Diffstat (limited to 'module/plugins/internal/SimpleHoster.py')
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index 98afe8b4c..744a1f686 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -16,7 +16,7 @@ from module.utils import fixup, fs_encode class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "1.97" + __version__ = "1.98" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -334,13 +334,16 @@ class SimpleHoster(Hoster): elif self.DL_LIMIT_PATTERN and re.search(self.DL_LIMIT_PATTERN, self.html): m = re.search(self.DL_LIMIT_PATTERN, self.html) try: - errmsg = m.group(1).strip() + errmsg = m.group(1) except (AttributeError, IndexError): - errmsg = m.group(0).strip() + errmsg = m.group(0) - self.info['error'] = re.sub(r'<.*?>', " ", errmsg) - self.log_warning(self.info['error']) + finally: + errmsg = re.sub(r'<.*?>', " ", errmsg.strip()) + + self.info['error'] = errmsg + self.log_warning(errmsg) wait_time = parse_time(errmsg) self.wait(wait_time, reconnect=wait_time > 300) @@ -358,8 +361,11 @@ class SimpleHoster(Hoster): except (AttributeError, IndexError): errmsg = m.group(0).strip() - self.info['error'] = re.sub(r'<.*?>', " ", errmsg) - self.log_warning(self.info['error']) + finally: + errmsg = re.sub(r'<.*?>', " ", errmsg) + + self.info['error'] = errmsg + self.log_warning(errmsg) if re.search('limit|wait|slot', errmsg, re.I): wait_time = parse_time(errmsg) |