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

[senate] Extend _VALID_URL (fixes #5836)

This commit is contained in:
Yen Chi Hsuan 2015-05-29 12:44:31 +08:00
parent 9e0b579128
commit 84e1e036c2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/senateisvp.py
View File

@ -48,7 +48,7 @@ class SenateISVPIE(InfoExtractor):
["arch", "", "http://ussenate-f.akamaihd.net/"] ["arch", "", "http://ussenate-f.akamaihd.net/"]
] ]
_IE_NAME = 'senate.gov' _IE_NAME = 'senate.gov'
_VALID_URL = r'http://www\.senate\.gov/isvp/\?(?P<qs>.+)' _VALID_URL = r'http://www\.senate\.gov/isvp/?\?(?P<qs>.+)'
_TESTS = [{ _TESTS = [{
'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png', 'url': 'http://www.senate.gov/isvp/?comm=judiciary&type=live&stt=&filename=judiciary031715&auto_play=false&wmode=transparent&poster=http%3A%2F%2Fwww.judiciary.senate.gov%2Fthemes%2Fjudiciary%2Fimages%2Fvideo-poster-flash-fit.png',
'info_dict': { 'info_dict': {
@ -72,12 +72,16 @@ class SenateISVPIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'Integrated Senate Video Player' 'title': 'Integrated Senate Video Player'
} }
}, {
# From http://www.c-span.org/video/?96791-1
'url': 'http://www.senate.gov/isvp?type=live&comm=banking&filename=banking012715',
'only_matching': True,
}] }]
@staticmethod @staticmethod
def _search_iframe_url(webpage): def _search_iframe_url(webpage):
mobj = re.search( mobj = re.search(
r"<iframe[^>]+src=['\"](?P<url>http://www\.senate\.gov/isvp/\?[^'\"]+)['\"]", r"<iframe[^>]+src=['\"](?P<url>http://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]",
webpage) webpage)
if mobj: if mobj:
return mobj.group('url') return mobj.group('url')