From daddc7e36dba956d2623626ed0079694940f1b9e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 10 Mar 2015 23:05:38 +0100 Subject: [BasePlugin][SimpleHoster] Improve checkDownload rules --- module/plugins/hoster/BasePlugin.py | 11 ++++++++--- module/plugins/internal/SimpleHoster.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py index 4272ba3b5..a26a7a180 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.36" + __version__ = "0.37" __pattern__ = r'^unmatchable$' @@ -86,10 +86,15 @@ class BasePlugin(Hoster): self.fail(_("No file downloaded")) #@TODO: Move to hoster class in 0.4.10 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 error' : re.compile(r'\A(?:\s*<.+>)?((?:[\w\s]*(?:[Ee]rror|ERROR)\s*\:?)?\s*\d{3})(?:\Z|\s+)'), 'Html file' : re.compile(r'\A\s*)?([\w\s]*([Ee]rror|ERROR)\s*:?)?\s*\d{3}(\Z|\s+)')}) + 'Html error': re.compile(r'\A(?:\s*<.+>)?((?:[\w\s]*(?:[Ee]rror|ERROR)\s*\:?)?\s*\d{3})(?:\Z|\s+)')}) if not errmsg: for r, p in [('Html file' , re.compile(r'\A\s*