v/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2020-11-18 19:53:54 -08:00
Code Issues Releases Wiki Activity

Removed possibility of None as format URL

Browse Source
This commit is contained in:
Logan Fleur 2018-07-09 22:58:15 +02:00
parent 744e369543
commit 6e55c2c264
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
youtube_dl/extractor/dw.py
View File

@ -66,12 +66,14 @@ class DWIE(InfoExtractor):
media = self._download_json(self._SOURCES_URL % (player_type[0], media_id), media_id) media = self._download_json(self._SOURCES_URL % (player_type[0], media_id), media_id)
extracted_formats = [] extracted_formats = []
for medium in media: for medium in media:
extracted_formats.append({ file = medium.get('file')
'url': medium.get('file') if file is not None:
}) extracted_formats.append({
label = medium.get('label') 'url': file
if label is not None: })
extracted_formats[-1]['format_id'] = label label = medium.get('label')
if label is not None:
extracted_formats[-1]['format_id'] = label
return extracted_formats return extracted_formats
media_id = self._match_id(url) media_id = self._match_id(url)
@ -80,22 +82,19 @@ class DWIE(InfoExtractor):
title = hidden_inputs.get('media_title') title = hidden_inputs.get('media_title')
media_id = hidden_inputs.get('media_id') or media_id media_id = hidden_inputs.get('media_id') or media_id
player_type = hidden_inputs.get('player_type') player_type = hidden_inputs.get('player_type')
file_name = hidden_inputs.get('file_name')
formats = []
if player_type == 'video': if player_type == 'video' and hidden_inputs.get('stream_file') == '1':
if hidden_inputs.get('stream_file') == '1':
formats = self._extract_smil_formats( formats = self._extract_smil_formats(
'http://www.dw.com/smil/v-%s' % media_id, media_id, 'http://www.dw.com/smil/v-%s' % media_id, media_id,
transform_source=lambda s: s.replace( transform_source=lambda s: s.replace(
'rtmp://tv-od.dw.de/flash/', 'rtmp://tv-od.dw.de/flash/',
'http://tv-download.dw.de/dwtv_video/flv/')) 'http://tv-download.dw.de/dwtv_video/flv/'))
self._sort_formats(formats)
else: if not formats:
formats = extract_formats() formats = extract_formats() or [{'url': file_name}] if file_name else []
self._sort_formats(formats) self._sort_formats(formats)
elif player_type == 'audio':
formats = extract_formats()
else:
formats = [{'url': hidden_inputs.get('file_name')}]
upload_date = hidden_inputs.get('display_date') upload_date = hidden_inputs.get('display_date')
if not upload_date: if not upload_date: