Madeorsk
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge cdb6839832 into 48c5663c5f

This commit is contained in:
Frank Aurich 2020-10-22 11:48:00 -04:00 committed by GitHub
parent 48c5663c5f cdb6839832
commit 1c0e703c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
youtube_dl/extractor/mdr.py
View File

@ -75,6 +75,18 @@ class MDRIE(InfoExtractor):
}, {
'url': 'http://www.mdr.de/mediathek/mdr-videos/a/video-1334.html',
'only_matching': True,
}, {
'url': 'https://www.kika.de/petronella-apfelmus/sendungen/sendung124504.html',
'info_dict': {
'id': '124504',
'ext': 'mp4',
'title': '2. Papa ist geschrumpft',
'description': 'md5:0374fa1997819a5ad2a2659af81264c6',
'timestamp': 1602477300,
'upload_date': '20201012',
'duration': 685,
'uploader': 'ZDF',
},
}]
def _real_extract(self, url):
@ -103,7 +115,7 @@ class MDRIE(InfoExtractor):
continue
video_url = url_el.text
if video_url in processed_urls:
if video_url is None or video_url in processed_urls:
continue
processed_urls.append(video_url)
@ -128,12 +140,19 @@ class MDRIE(InfoExtractor):
f = {
'url': video_url,
'format_id': '%s-%d' % (media_type, vbr or abr),
'filesize': filesize,
'abr': abr,
'preference': 1,
}
if filesize:
f.update({'filesize': filesize})
if vbr or abr:
f.update({
'format_id': '%s-%d' % (media_type, vbr or abr)})
else:
f.update({'format_id': media_type})
if vbr:
width = int_or_none(xpath_text(asset, './frameWidth', 'width'))
height = int_or_none(xpath_text(asset, './frameHeight', 'height'))
@ -153,10 +172,7 @@ class MDRIE(InfoExtractor):
abr = f.get('tbr') or abr
if 'tbr' in f:
del f['tbr']
f.update({
'abr': abr,
'vcodec': 'none',
})
f.update({'abr': abr})
formats.extend(url_formats)