R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multimedia_id extracted from meta

Browse Source 
still uses old method as fallback
This commit is contained in:
PC 2015-10-10 15:09:19 +01:00
parent 93c4892455
commit 23eee291d9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/extractor/iol.py
View File

@ -52,15 +52,20 @@ class IOLIE(InfoExtractor):
m3u8_url = self._html_search_regex(r'''videoUrl:\s*'([^']+\.m3u8[^']*)'\s*,''', webpage, 'm3u8 playlist') m3u8_url = self._html_search_regex(r'''videoUrl:\s*'([^']+\.m3u8[^']*)'\s*,''', webpage, 'm3u8 playlist')
formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4') formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4')
multimedia_id = self._html_search_meta('iol:id', webpage, 'multimedia_id', fatal=False, default=None)
if multimedia_id is None:
match = re.search(r'smil:([0-9a-f]{24})-L', m3u8_url, re.IGNORECASE) match = re.search(r'smil:([0-9a-f]{24})-L', m3u8_url, re.IGNORECASE)
self.report_extraction('multimedia_id (fallback)')
if match: if match:
multimedia_id = match.group(1) multimedia_id = match.group(1)
if multimedia_id is not None:
m3u8_url_default = 'http://video-on-demand.iol.pt/vod_http/mp4:' + multimedia_id + '-L-500k.mp4/playlist.m3u8' m3u8_url_default = 'http://video-on-demand.iol.pt/vod_http/mp4:' + multimedia_id + '-L-500k.mp4/playlist.m3u8'
formats_m3u8_default = self._extract_m3u8_formats(m3u8_url_default, video_id, ext='mp4') formats_m3u8_default = self._extract_m3u8_formats(m3u8_url_default, video_id, ext='mp4')
formats.extend(formats_m3u8_default) formats.extend(formats_m3u8_default)
formats.append({ formats.append({
'url': 'http://www.iol.pt/videos-file/' + multimedia_id + '-L-500k.mp4', 'url': 'http://www.iol.pt/videos-file/' + multimedia_id + '-L-500k.mp4',
'format_id': 'http_500', 'format_id': 'http-500',
'tbr': 500, 'tbr': 500,
'protocol': 'http', 'protocol': 'http',
'preference': -1, 'preference': -1,