aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dlc/extractor/ustream.py
diff options
context:
space:
mode:
authorTom-Oliver Heidel <github@tom-oliver.eu>2020-11-30 02:20:18 +0100
committerGitHub <noreply@github.com>2020-11-30 02:20:18 +0100
commitef5a4db06cb7667dc555f0dc1982de2c5258eb37 (patch)
treec947a547303ccf19483e83ea9d3ea77c74b5b7a8 /youtube_dlc/extractor/ustream.py
parent93201d50aa5e0bce0ecf6941cd6f9ea6c9ef86a5 (diff)
parentc78b936af4366259605e3e706bdeb5e173bf3d9b (diff)
downloadhypervideo-pre-ef5a4db06cb7667dc555f0dc1982de2c5258eb37.tar.lz
hypervideo-pre-ef5a4db06cb7667dc555f0dc1982de2c5258eb37.tar.xz
hypervideo-pre-ef5a4db06cb7667dc555f0dc1982de2c5258eb37.zip
Merge pull request #245 from pukkandan/merge-main
Merge youtube-dl and fix Youtube Feeds
Diffstat (limited to 'youtube_dlc/extractor/ustream.py')
-rw-r--r--youtube_dlc/extractor/ustream.py7
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')