From 1293f4c3aaf0744b98fcd538bd2ddb8cb1d1733c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 22 May 2015 23:26:46 +0200 Subject: [XFSHoster] Handle videoplayer --- module/plugins/hoster/ExashareCom.py | 1 - module/plugins/hoster/StreamcloudEu.py | 2 -- module/plugins/internal/XFSHoster.py | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'module/plugins') diff --git a/module/plugins/hoster/ExashareCom.py b/module/plugins/hoster/ExashareCom.py index 536c09b6d..d70ca6d3a 100644 --- a/module/plugins/hoster/ExashareCom.py +++ b/module/plugins/hoster/ExashareCom.py @@ -18,7 +18,6 @@ class ExashareCom(XFSHoster): INFO_PATTERN = r'>(?P.+?)\( (?P[\d.,]+) (?P[\w^_]+)' - LINK_FREE_PATTERN = r'file: "(.+?)"' def setup(self): diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py index 54f430508..0f8c08ad9 100644 --- a/module/plugins/hoster/StreamcloudEu.py +++ b/module/plugins/hoster/StreamcloudEu.py @@ -19,8 +19,6 @@ class StreamcloudEu(XFSHoster): WAIT_PATTERN = r'var count = (\d+)' - LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud\.eu:?\d*/.*/video\.(mp4|flv))",' - def setup(self): self.multiDL = True diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py index 57357c06e..24d06d993 100644 --- a/module/plugins/internal/XFSHoster.py +++ b/module/plugins/internal/XFSHoster.py @@ -13,7 +13,7 @@ from module.utils import html_unescape class XFSHoster(SimpleHoster): __name__ = "XFSHoster" __type__ = "hoster" - __version__ = "0.50" + __version__ = "0.51" __pattern__ = r'^unmatchable$' @@ -75,7 +75,7 @@ class XFSHoster(SimpleHoster): self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english")) if not self.LINK_PATTERN: - pattern = r'(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<]' + pattern = r'(?:file: "(.+?)"|(https?://(?:www\.)?([^/]*?%s|\d+\.\d+\.\d+\.\d+)(\:\d+)?(/d/|(/files)?/\d+/\w+/).+?)["\'<])' self.LINK_PATTERN = pattern % self.HOSTER_DOMAIN.replace('.', '\.') super(XFSHoster, self).prepare() -- cgit v1.2.3