pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-18 03:20:09 +09:00
Code Issues Projects Releases Wiki Activity

[screenwavemedia] Make more robust

Browse Source
This commit is contained in:
Sergey M․ 2015-08-16 20:18:15 +06:00
parent 0086874277
commit 8626b23e4e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube_dl/extractor/screenwavemedia.py
View File

@ -51,19 +51,38 @@ class ScreenwaveMediaIE(InfoExtractor):
) )
) )
), ),
video_id video_id, fatal=False
) )
# Fallback to hardcoded sources if JS changes again
if not sources:
sources = [{
'file': 'http://%s/vod/%s_%s.mp4' % (videoserver, video_id, format_id),
'type': 'mp4',
'label': format_label,
} for format_id, format_label in (
('low', '144p Low'), ('med', '160p Med'), ('high', '360p High'), ('hd1', '720p HD1'))]
sources.append({
'file': 'http://%s/vod/smil:%s.smil/playlist.m3u8' % (videoserver, video_id),
'type': 'hls',
})
formats = [] formats = []
for source in sources: for source in sources:
if source['type'] == 'hls': if source['type'] == 'hls':
formats.extend(self._extract_m3u8_formats(source['file'], video_id)) formats.extend(self._extract_m3u8_formats(source['file'], video_id))
else: else:
file_ = source.get('file')
if not file_:
continue
format_label = source.get('label') format_label = source.get('label')
format_id = self._search_regex(
r'_(.+?)\.[^.]+$', file_, 'format id', default=None)
height = int_or_none(self._search_regex( height = int_or_none(self._search_regex(
r'^(\d+)[pP]', format_label, 'height', default=None)) r'^(\d+)[pP]', format_label, 'height', default=None))
formats.append({ formats.append({
'url': source['file'], 'url': source['file'],
'format_id': format_id,
'format': format_label, 'format': format_label,
'ext': source.get('type'), 'ext': source.get('type'),
'height': height, 'height': height,