diff options
| author | pukkandan <pukkandan@gmail.com> | 2020-11-20 00:52:59 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan@gmail.com> | 2020-11-20 13:03:32 +0530 |
| commit | 8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b (patch) | |
| tree | c5ba0d26e17bb3102c0b24886853d9a818e875c6 /youtube_dlc/extractor/ustream.py | |
| parent | 228385340e9a976f52735078218a9b8ecfe7ae7a (diff) | |
| download | hypervideo-pre-8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b.tar.lz hypervideo-pre-8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b.tar.xz hypervideo-pre-8bdd16b4993b8d546b4cbbdbe4710db0bc2f971b.zip | |
Merge 'ytdl-org/youtube-dl/master' release 2020.11.19
Old Extractors left behind:
VLivePlaylistIE
YoutubeSearchURLIE
YoutubeShowIE
YoutubeFavouritesIE
If removing old extractors, make corresponding changes in
docs/supportedsites.md
youtube_dlc/extractor/extractors.py
Not merged:
.github/ISSUE_TEMPLATE/1_broken_site.md
.github/ISSUE_TEMPLATE/2_site_support_request.md
.github/ISSUE_TEMPLATE/3_site_feature_request.md
.github/ISSUE_TEMPLATE/4_bug_report.md
.github/ISSUE_TEMPLATE/5_feature_request.md
test/test_all_urls.py
youtube_dlc/version.py
Changelog
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') |