projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction.
[youtube-dl]
/
youtube_dl
/
extractor
/
ustream.py
diff --git
a/youtube_dl/extractor/ustream.py
b/youtube_dl/extractor/ustream.py
index 5737d4d16c853193f5beb08b2eff7126c6be3d3c..9e860aeb761aae86de24b20ce29c6250c4ff52bf 100644
(file)
--- a/
youtube_dl/extractor/ustream.py
+++ b/
youtube_dl/extractor/ustream.py
@@
-19,7
+19,7
@@
from ..utils import (
class UstreamIE(InfoExtractor):
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',
IE_NAME = 'ustream'
_TESTS = [{
'url': 'http://www.ustream.tv/recorded/20274954',
@@
-67,12
+67,15
@@
class UstreamIE(InfoExtractor):
'params': {
'skip_download': True, # m3u8 download
},
'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(
}]
@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')
if mobj is not None:
return mobj.group('url')
@@
-165,7
+168,7
@@
class UstreamIE(InfoExtractor):
m = re.match(self._VALID_URL, url)
video_id = m.group('id')
m = re.match(self._VALID_URL, url)
video_id = m.group('id')
- # some sites use this embed format (see: https://github.com/
rg3
/youtube-dl/issues/2990)
+ # some sites use this embed format (see: https://github.com/
ytdl-org
/youtube-dl/issues/2990)
if m.group('type') == 'embed/recorded':
video_id = m.group('id')
desktop_url = 'http://www.ustream.tv/recorded/' + video_id
if m.group('type') == 'embed/recorded':
video_id = m.group('id')
desktop_url = 'http://www.ustream.tv/recorded/' + video_id