diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-14 10:31:05 +0100 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-14 10:31:05 +0100 |
| commit | c4719b75e43bed931f79ba763b8e8d81a2318710 (patch) | |
| tree | cafce57662d3d7a6f12446cb314895aa59d597a9 /module | |
| parent | [NowDownloadSx][NowVideoSx] Update __pattern__ (diff) | |
| download | pyload-c4719b75e43bed931f79ba763b8e8d81a2318710.tar.xz | |
[BasePlugin][SimpleHoster] Better checkDownload warning
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/hoster/BasePlugin.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/SimpleHoster.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index ba0f1781e..bd73a72b0 100644 --- a/module/plugins/hoster/BasePlugin.py +++ b/module/plugins/hoster/BasePlugin.py @@ -13,7 +13,7 @@ from module.plugins.Hoster import Hoster class BasePlugin(Hoster): __name__ = "BasePlugin" __type__ = "hoster" - __version__ = "0.37" + __version__ = "0.38" __pattern__ = r'^unmatchable$' @@ -88,7 +88,7 @@ class BasePlugin(Hoster): errmsg = self.checkDownload({'Empty file' : re.compile(r'\A\s*\Z'), 'Html error' : re.compile(r'\A(?:\s*<.+>)?((?:[\w\s]*(?:[Ee]rror|ERROR)\s*\:?)?\s*\d{3})(?:\Z|\s+)'), 'Html file' : re.compile(r'\A\s*<!DOCTYPE html'), - 'Unknown error': re.compile(r'([Aa]n error occured while processing your request)')}) + 'Request error': re.compile(r'([Aa]n error occured while processing your request)')}) if not errmsg: return @@ -97,7 +97,7 @@ class BasePlugin(Hoster): except Exception: pass - self.logWarning("Bad file", "Waiting 1 minute and retry") + self.logWarning("Check result: " + errmsg, "Waiting 1 minute and retry") self.retry(3, 60, errmsg) diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py index a1825a73e..114128c63 100644 --- a/module/plugins/internal/SimpleHoster.py +++ b/module/plugins/internal/SimpleHoster.py @@ -246,7 +246,7 @@ def secondsToMidnight(gmt=0): class SimpleHoster(Hoster): __name__ = "SimpleHoster" __type__ = "hoster" - __version__ = "1.24" + __version__ = "1.25" __pattern__ = r'^unmatchable$' @@ -514,7 +514,7 @@ class SimpleHoster(Hoster): if not errmsg: for r, p in [('Html file' , re.compile(r'\A\s*<!DOCTYPE html') ), - ('Unknown error', re.compile(r'([Aa]n error occured while processing your request)'))]: + ('Request error', re.compile(r'([Aa]n error occured while processing your request)'))]: if r not in rules: rules[r] = p @@ -536,7 +536,7 @@ class SimpleHoster(Hoster): except Exception: pass - self.logWarning("Bad file", "Waiting 1 minute and retry") + self.logWarning("Check result: " + errmsg, "Waiting 1 minute and retry") self.retry(3, 60, errmsg) |