Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-23 00:54:31 +01:00
Code Issues Releases Wiki Activity

Merge pull request #5588 from aajanki/encode_frag_filenames

Browse Source 
[f4m] Fix encode error by sanitizing fragment filenames
This commit is contained in:
Sergey M. 2015-08-31 02:18:15 +06:00
commit 55801fc76e
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
youtube_dl/downloader/f4m.py
View File

@ -343,18 +343,19 @@ class F4mFD(FragmentFD):
success = ctx['dl'].download(frag_filename, {'url': url}) success = ctx['dl'].download(frag_filename, {'url': url})
if not success: if not success:
return False return False
with open(frag_filename, 'rb') as down: (down, frag_sanitized) = sanitize_open(frag_filename, 'rb')
down_data = down.read() down_data = down.read()
reader = FlvReader(down_data) down.close()
while True: reader = FlvReader(down_data)
_, box_type, box_data = reader.read_box_info() while True:
if box_type == b'mdat': _, box_type, box_data = reader.read_box_info()
dest_stream.write(box_data) if box_type == b'mdat':
break dest_stream.write(box_data)
break
if live: if live:
os.remove(frag_filename) os.remove(encodeFilename(frag_sanitized))
else: else:
frags_filenames.append(frag_filename) frags_filenames.append(frag_sanitized)
except (compat_urllib_error.HTTPError, ) as err: except (compat_urllib_error.HTTPError, ) as err:
if live and (err.code == 404 or err.code == 410): if live and (err.code == 404 or err.code == 410):
# We didn't keep up with the live window. Continue # We didn't keep up with the live window. Continue
@ -375,6 +376,6 @@ class F4mFD(FragmentFD):
self._finish_frag_download(ctx) self._finish_frag_download(ctx)
for frag_file in frags_filenames: for frag_file in frags_filenames:
os.remove(frag_file) os.remove(encodeFilename(frag_file))
return True return True