diff options
Diffstat (limited to 'hypervideo_dl/extractor/wimtv.py')
| -rw-r--r-- | hypervideo_dl/extractor/wimtv.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/hypervideo_dl/extractor/wimtv.py b/hypervideo_dl/extractor/wimtv.py index ea953bf..5711123 100644 --- a/hypervideo_dl/extractor/wimtv.py +++ b/hypervideo_dl/extractor/wimtv.py @@ -1,8 +1,3 @@ -# coding: utf-8 -from __future__ import unicode_literals - -import re - from .common import InfoExtractor from ..utils import ( determine_ext, @@ -15,14 +10,15 @@ from ..utils import ( class WimTVIE(InfoExtractor): _player = None _UUID_RE = r'[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}' - _VALID_URL = r'''(?x) + _VALID_URL = r'''(?x: https?://platform.wim.tv/ (?: (?:embed/)?\? |\#/webtv/.+?/ ) (?P<type>vod|live|cast)[=/] - (?P<id>%s).*?''' % _UUID_RE + (?P<id>%s).*?)''' % _UUID_RE + _EMBED_REGEX = [rf'<iframe[^>]+src=["\'](?P<url>{_VALID_URL})'] _TESTS = [{ # vod stream 'url': 'https://platform.wim.tv/embed/?vod=db29fb32-bade-47b6-a3a6-cb69fe80267a', @@ -57,14 +53,6 @@ class WimTVIE(InfoExtractor): 'only_matching': True, }] - @staticmethod - def _extract_urls(webpage): - return [ - mobj.group('url') - for mobj in re.finditer( - r'<iframe[^>]+src=["\'](?P<url>%s)' % WimTVIE._VALID_URL, - webpage)] - def _real_initialize(self): if not self._player: self._get_player_data() @@ -151,7 +139,6 @@ class WimTVIE(InfoExtractor): }) json = json.get('resource') thumb = self._generate_thumbnail(json.get('thumbnailId')) - self._sort_formats(formats) return { 'id': video_id, |