github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[downloader/f4m] <metadata> is optional according to the F4M specs

Browse source
This commit is contained in:
Antti Ajanki 2015-01-05 20:12:29 +02:00
parent f4bca0b348
commit 3b8f3a1504
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
youtube_dl/downloader/f4m.py
View file

@ -187,15 +187,18 @@ def build_fragments_list(boot_info):
return res return res
def write_flv_header(stream, metadata): def write_flv_header(stream):
"""Writes the FLV header and the metadata to stream""" """Writes the FLV header to stream"""
# FLV header # FLV header
stream.write(b'FLV\x01') stream.write(b'FLV\x01')
stream.write(b'\x05') stream.write(b'\x05')
stream.write(b'\x00\x00\x00\x09') stream.write(b'\x00\x00\x00\x09')
# FLV File body
stream.write(b'\x00\x00\x00\x00') stream.write(b'\x00\x00\x00\x00')
# FLVTAG
def write_metadata_tag(stream, metadata):
"""Writes optional metadata tag to stream"""
if metadata:
# Script data # Script data
stream.write(b'\x12') stream.write(b'\x12')
# Size of the metadata with 3 bytes # Size of the metadata with 3 bytes
@ -256,7 +259,11 @@ class F4mFD(FileDownloader):
bootstrap = self.ydl.urlopen(bootstrap_url).read() bootstrap = self.ydl.urlopen(bootstrap_url).read()
else: else:
bootstrap = base64.b64decode(bootstrap_node.text) bootstrap = base64.b64decode(bootstrap_node.text)
metadata = base64.b64decode(media.find(_add_ns('metadata')).text) metadata_node = media.find(_add_ns('metadata'))
if metadata_node is not None:
metadata = base64.b64decode(metadata_node.text)
else:
metadata = None
boot_info = read_bootstrap_info(bootstrap) boot_info = read_bootstrap_info(bootstrap)
fragments_list = build_fragments_list(boot_info) fragments_list = build_fragments_list(boot_info)
@ -269,7 +276,8 @@ class F4mFD(FileDownloader):
tmpfilename = self.temp_name(filename) tmpfilename = self.temp_name(filename)
(dest_stream, tmpfilename) = sanitize_open(tmpfilename, 'wb') (dest_stream, tmpfilename) = sanitize_open(tmpfilename, 'wb')
write_flv_header(dest_stream, metadata) write_flv_header(dest_stream)
write_metadata_tag(dest_stream, metadata)
# This dict stores the download progress, it's updated by the progress # This dict stores the download progress, it's updated by the progress
# hook # hook