dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix _TEST for Ustream embed URLs

This commit is contained in:
anovicecodemonkey 2014-04-05 03:26:29 +10:30
parent 5c38625259
commit ca6aada48e
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/extractor/generic.py
View File

@ -189,6 +189,8 @@ class GenericIE(InfoExtractor):
'url': 'http://www.american.edu/spa/pti/nsa-privacy-janus-2014.cfm', 'url': 'http://www.american.edu/spa/pti/nsa-privacy-janus-2014.cfm',
'md5': '27b99cdb639c9b12a79bca876a073417', 'md5': '27b99cdb639c9b12a79bca876a073417',
'info_dict': { 'info_dict': {
'id': '45734260',
'ext': 'flv',
'uploader': 'AU SPA: The NSA and Privacy', 'uploader': 'AU SPA: The NSA and Privacy',
'title': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman' 'title': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman'
} }

12
youtube_dl/extractor/ustream.py
View File

@ -13,7 +13,7 @@ from ..utils import (
class UstreamIE(InfoExtractor): class UstreamIE(InfoExtractor):
_VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed)/(?P<videoID>\d+)' _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed)/(?P<videoID>\d+)'
IE_NAME = 'ustream' IE_NAME = 'ustream'
_TESTS = [{ _TEST = {
'url': 'http://www.ustream.tv/recorded/20274954', 'url': 'http://www.ustream.tv/recorded/20274954',
'file': '20274954.flv', 'file': '20274954.flv',
'md5': '088f151799e8f572f84eb62f17d73e5c', 'md5': '088f151799e8f572f84eb62f17d73e5c',
@ -21,17 +21,7 @@ class UstreamIE(InfoExtractor):
"uploader": "Young Americans for Liberty", "uploader": "Young Americans for Liberty",
"title": "Young Americans for Liberty February 7, 2012 2:28 AM", "title": "Young Americans for Liberty February 7, 2012 2:28 AM",
}, },
},
{
'url': 'http://www.ustream.tv/embed/17357891',
'file': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman-45734260.flv',
'md5': '27b99cdb639c9b12a79bca876a073417',
'info_dict': {
"uploader": "AU SPA: The NSA and Privacy",
"title": "NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman"
},
} }
]
def _real_extract(self, url): def _real_extract(self, url):
m = re.match(self._VALID_URL, url) m = re.match(self._VALID_URL, url)