w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[nhl] Skip invalid m3u8 formats (closes #10713)

Browse source
This commit is contained in:
Yen Chi Hsuan 2016-10-11 20:50:52 +08:00
parent 3d643f4cec
commit 55642487f0
No known key found for this signature in database
GPG key ID: 3FDDD575826C5C30
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -4,6 +4,7 @@ Core
* [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387) * [Makefile] Support for GNU make < 4 is fixed; BSD make dropped (#9387)
Extractors Extractors
* [nhl] Correctly handle invalid formats (#10713)
* [footyroom] Fix extraction (#10810) * [footyroom] Fix extraction (#10810)
* [abc.net.au:iview] Fix for standalone (non series) videos (#10895) * [abc.net.au:iview] Fix for standalone (non series) videos (#10895)
+ [hbo] Add support for episode pages (#10892) + [hbo] Add support for episode pages (#10892)

18
youtube_dl/extractor/nhl.py
View file

@ -274,6 +274,18 @@ class NHLIE(InfoExtractor):
'upload_date': '20160204', 'upload_date': '20160204',
'timestamp': 1454544904, 'timestamp': 1454544904,
}, },
}, {
# Some m3u8 URLs are invalid (https://github.com/rg3/youtube-dl/issues/10713)
'url': 'https://www.nhl.com/predators/video/poile-laviolette-on-subban-trade/t-277437416/c-44315003',
'md5': '50b2bb47f405121484dda3ccbea25459',
'info_dict': {
'id': '44315003',
'ext': 'mp4',
'title': 'Poile, Laviolette on Subban trade',
'description': 'General manager David Poile and head coach Peter Laviolette share their thoughts on acquiring P.K. Subban from Montreal (06/29/16)',
'timestamp': 1467242866,
'upload_date': '20160629',
},
}, { }, {
'url': 'https://www.wch2016.com/video/caneur-best-of-game-2-micd-up/t-281230378/c-44983703', 'url': 'https://www.wch2016.com/video/caneur-best-of-game-2-micd-up/t-281230378/c-44983703',
'only_matching': True, 'only_matching': True,
@ -301,9 +313,11 @@ class NHLIE(InfoExtractor):
continue continue
ext = determine_ext(playback_url) ext = determine_ext(playback_url)
if ext == 'm3u8': if ext == 'm3u8':
formats.extend(self._extract_m3u8_formats( m3u8_formats = self._extract_m3u8_formats(
playback_url, video_id, 'mp4', 'm3u8_native', playback_url, video_id, 'mp4', 'm3u8_native',
m3u8_id=playback.get('name', 'hls'), fatal=False)) m3u8_id=playback.get('name', 'hls'), fatal=False)
self._check_formats(m3u8_formats, video_id)
formats.extend(m3u8_formats)
else: else:
height = int_or_none(playback.get('height')) height = int_or_none(playback.get('height'))
formats.append({ formats.append({