1
0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-12-25 15:57:55 +01:00

Supports http_mp4 and adds another m3u8 source

This commit is contained in:
PC 2015-10-10 05:10:54 +01:00
parent fdeca4b2f8
commit 166316dba6

View File

@ -7,7 +7,7 @@ import re
class IOLIE(InfoExtractor): class IOLIE(InfoExtractor):
_VALID_URL = r'http://(tviplayer|www\.tvi24)\.iol\.pt/.*/(?P<id>[0-9a-f]{24})[/0-9]*$' _VALID_URL = r'http://(tviplayer|(www\.tvi24))\.iol\.pt/.*/(?P<id>[0-9a-f]{24})($|\/)'
_TESTS = [{ _TESTS = [{
'url': 'http://tviplayer.iol.pt/programa/euromilhoes/53c6b3153004dc006243b07b/video/55f878f90cf203f8b03cea6d', 'url': 'http://tviplayer.iol.pt/programa/euromilhoes/53c6b3153004dc006243b07b/video/55f878f90cf203f8b03cea6d',
'md5': 'a9b3e3630201401fc3b8099d9d689191', 'md5': 'a9b3e3630201401fc3b8099d9d689191',
@ -52,6 +52,22 @@ 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')
match = re.search(r'smil:([0-9a-f]{24})-L', m3u8_url, re.IGNORECASE)
if match:
multimedia_id = match.group(1)
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.extend(formats_m3u8_default)
formats.append({
'url': 'http://www.iol.pt/videos-file/' + multimedia_id + '-L-500k.mp4',
'format_id': 'http_500',
'tbr': 500,
'protocol': 'http',
'protocol': 'http',
'preference': -1,
'no_resume': False
})
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,