diff options
| author | Tom-Oliver Heidel <github@tom-oliver.eu> | 2020-11-30 02:51:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 02:51:41 +0100 |
| commit | b662fc8d2033c615ffbdd3b51123b446c03255e8 (patch) | |
| tree | 3d32dc25a663f4e61fc28860acda67c7a425cb7a /youtube_dlc/extractor/ustream.py | |
| parent | 8924ddc3eec4c03c6776673d0d5e823dc5445549 (diff) | |
| parent | 929576bb9e4aa31f0516f1437d2ae762afdd9f2c (diff) | |
| download | hypervideo-pre-b662fc8d2033c615ffbdd3b51123b446c03255e8.tar.lz hypervideo-pre-b662fc8d2033c615ffbdd3b51123b446c03255e8.tar.xz hypervideo-pre-b662fc8d2033c615ffbdd3b51123b446c03255e8.zip | |
Merge branch 'master' into gedi
Diffstat (limited to 'youtube_dlc/extractor/ustream.py')
| -rw-r--r-- | youtube_dlc/extractor/ustream.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dlc/extractor/ustream.py b/youtube_dlc/extractor/ustream.py index 582090d0d..9e860aeb7 100644 --- a/youtube_dlc/extractor/ustream.py +++ b/youtube_dlc/extractor/ustream.py @@ -19,7 +19,7 @@ from ..utils import ( class UstreamIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?ustream\.tv/(?P<type>recorded|embed|embed/recorded)/(?P<id>\d+)' + _VALID_URL = r'https?://(?:www\.)?(?:ustream\.tv|video\.ibm\.com)/(?P<type>recorded|embed|embed/recorded)/(?P<id>\d+)' IE_NAME = 'ustream' _TESTS = [{ 'url': 'http://www.ustream.tv/recorded/20274954', @@ -67,12 +67,15 @@ class UstreamIE(InfoExtractor): 'params': { 'skip_download': True, # m3u8 download }, + }, { + 'url': 'https://video.ibm.com/embed/recorded/128240221?&autoplay=true&controls=true&volume=100', + 'only_matching': True, }] @staticmethod def _extract_url(webpage): mobj = re.search( - r'<iframe[^>]+?src=(["\'])(?P<url>http://www\.ustream\.tv/embed/.+?)\1', webpage) + r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:www\.)?(?:ustream\.tv|video\.ibm\.com)/embed/.+?)\1', webpage) if mobj is not None: return mobj.group('url') |