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

[tv2hu] using .get() on json

Browse Source
This commit is contained in:
Vukkk 2016-09-26 13:07:34 +02:00
parent df5c8a8865
commit 6a90314a26
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
youtube_dl/extractor/tv2hu.py
View File

@ -27,34 +27,10 @@ class TV2HUIE(InfoExtractor):
} }
}, { }, {
'url': 'http://tv2.hu/ezek_megorultek/teljes_adasok/217677_ezek-megorultek---1.-adas-2.-resz.html', 'url': 'http://tv2.hu/ezek_megorultek/teljes_adasok/217677_ezek-megorultek---1.-adas-2.-resz.html',
'info_dict': { 'only_matching': True
'id': '217677',
'ext': 'mp4',
'title': 'Ezek megőrültek! - 1. adás 2. rész',
'upload_id': '220290',
'upload_date': '20160826',
'uploader': 'ezek_megorultek',
'thumbnail': 're:^https?://.*\.jpg$'
},
'params': {
# m3u8 download
'skip_download': True,
}
}, { }, {
'url': 'http://tv2.hu/musoraink/aktiv/aktiv_teljes_adas/217963_aktiv-teljes-adas---2016.08.30..html', 'url': 'http://tv2.hu/musoraink/aktiv/aktiv_teljes_adas/217963_aktiv-teljes-adas---2016.08.30..html',
'info_dict': { 'only_matching': True
'id': '217963',
'ext': 'mp4',
'title': 'AKTÍV / Aktív teljes adás - 2016.08.30. / tv2.hu',
'upload_id': '220700',
'upload_date': '20160830',
'uploader': 'aktiv',
'thumbnail': 're:^https?://.*\.jpg$'
},
'params': {
# m3u8 download
'skip_download': True,
}
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -73,20 +49,20 @@ class TV2HUIE(InfoExtractor):
manifest_url, video_id, 'mp4', entry_protocol='m3u8_native') manifest_url, video_id, 'mp4', entry_protocol='m3u8_native')
for i in range(len(json_data['bitrates']['mp4'])): for i in range(len(json_data['bitrates']['mp4'])):
quality = json_data.get('mp4Labels')[i]
if json_data['mp4Labels'][i].lower() == 'auto': if json_data['mp4Labels'][i].lower() == 'auto':
continue continue
quality = str_to_int(json_data['mp4Labels'][i][:-1])
formats.append({ formats.append({
'protocol': 'http', 'protocol': 'http',
'url': json_data['bitrates']['mp4'][i], 'url': json_data['bitrates']['mp4'][i],
'height': quality, 'height': int(quality[:-1]),
'width': quality/9*16, 'width': int(quality[:-1])/9*16,
'ext': 'mp4', 'ext': 'mp4',
'format_id': json_data['mp4Labels'][i], 'format_id': quality,
'format_note': 'HTTP', 'format_note': 'HTTP',
'preference': str_to_int(json_data['mp4Labels'][i][:-1]) 'preference': int(quality[:-1])
}) })
self._sort_formats(formats) self._sort_formats(formats)