From 75a24854073e590f4efc9f037b57dee348f52b61 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Tue, 28 Jun 2016 18:07:50 +0100 Subject: [fragment,hls,f4m,dash,ism] improve fragment downloading - resume immediately - no need to concatenate segments and decrypt them on every resume - no need to save temp files for segments and for hls downloader: - no need to download keys for segments that already downloaded --- youtube_dl/downloader/fragment.py | 57 ++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 10 deletions(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 56f975266..44a3c1040 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -2,6 +2,7 @@ from __future__ import division, unicode_literals import os import time +import io from .common import FileDownloader from .http import HttpFD @@ -10,6 +11,7 @@ from ..utils import ( encodeFilename, sanitize_open, sanitized_Request, + compat_str, ) @@ -30,13 +32,13 @@ class FragmentFD(FileDownloader): Skip unavailable fragments (DASH and hlsnative only) """ - def report_retry_fragment(self, err, fragment_name, count, retries): + def report_retry_fragment(self, err, frag_index, count, retries): self.to_screen( - '[download] Got server HTTP error: %s. Retrying fragment %s (attempt %d of %s)...' - % (error_to_compat_str(err), fragment_name, count, self.format_retries(retries))) + '[download] Got server HTTP error: %s. Retrying fragment %d (attempt %d of %s)...' + % (error_to_compat_str(err), frag_index, count, self.format_retries(retries))) - def report_skip_fragment(self, fragment_name): - self.to_screen('[download] Skipping fragment %s...' % fragment_name) + def report_skip_fragment(self, frag_index): + self.to_screen('[download] Skipping fragment %d...' % frag_index) def _prepare_url(self, info_dict, url): headers = info_dict.get('http_headers') @@ -46,6 +48,25 @@ class FragmentFD(FileDownloader): self._prepare_frag_download(ctx) self._start_frag_download(ctx) + def _download_fragment(self, ctx, frag_url, info_dict, headers=None): + down = io.BytesIO() + success = ctx['dl'].download(down, { + 'url': frag_url, + 'http_headers': headers or info_dict.get('http_headers'), + }) + if not success: + return False, None + frag_content = down.getvalue() + down.close() + return True, frag_content + + def _append_fragment(self, ctx, frag_content): + ctx['dest_stream'].write(frag_content) + if not (ctx.get('live') or ctx['tmpfilename'] == '-'): + frag_index_stream, _ = sanitize_open(ctx['tmpfilename'] + '.fragindex', 'w') + frag_index_stream.write(compat_str(ctx['frag_index'])) + frag_index_stream.close() + def _prepare_frag_download(self, ctx): if 'live' not in ctx: ctx['live'] = False @@ -66,11 +87,26 @@ class FragmentFD(FileDownloader): } ) tmpfilename = self.temp_name(ctx['filename']) - dest_stream, tmpfilename = sanitize_open(tmpfilename, 'wb') + open_mode = 'wb' + resume_len = 0 + frag_index = 0 + # Establish possible resume length + if os.path.isfile(encodeFilename(tmpfilename)): + open_mode = 'ab' + resume_len = os.path.getsize(encodeFilename(tmpfilename)) + if os.path.isfile(encodeFilename(tmpfilename + '.fragindex')): + frag_index_stream, _ = sanitize_open(tmpfilename + '.fragindex', 'r') + frag_index = int(frag_index_stream.read()) + frag_index_stream.close() + dest_stream, tmpfilename = sanitize_open(tmpfilename, open_mode) + ctx.update({ 'dl': dl, 'dest_stream': dest_stream, 'tmpfilename': tmpfilename, + 'frag_index': frag_index, + # Total complete fragments downloaded so far in bytes + 'complete_frags_downloaded_bytes': resume_len, }) def _start_frag_download(self, ctx): @@ -79,8 +115,8 @@ class FragmentFD(FileDownloader): # hook state = { 'status': 'downloading', - 'downloaded_bytes': 0, - 'frag_index': 0, + 'downloaded_bytes': ctx['complete_frags_downloaded_bytes'], + 'frag_index': ctx['frag_index'], 'frag_count': total_frags, 'filename': ctx['filename'], 'tmpfilename': ctx['tmpfilename'], @@ -89,8 +125,6 @@ class FragmentFD(FileDownloader): start = time.time() ctx.update({ 'started': start, - # Total complete fragments downloaded so far in bytes - 'complete_frags_downloaded_bytes': 0, # Amount of fragment's bytes downloaded by the time of the previous # frag progress hook invocation 'prev_frag_downloaded_bytes': 0, @@ -111,6 +145,7 @@ class FragmentFD(FileDownloader): if s['status'] == 'finished': state['frag_index'] += 1 + ctx['frag_index'] = state['frag_index'] state['downloaded_bytes'] += frag_total_bytes - ctx['prev_frag_downloaded_bytes'] ctx['complete_frags_downloaded_bytes'] = state['downloaded_bytes'] ctx['prev_frag_downloaded_bytes'] = 0 @@ -132,6 +167,8 @@ class FragmentFD(FileDownloader): def _finish_frag_download(self, ctx): ctx['dest_stream'].close() + if os.path.isfile(encodeFilename(ctx['tmpfilename'] + '.fragindex')): + os.remove(encodeFilename(ctx['tmpfilename'] + '.fragindex')) elapsed = time.time() - ctx['started'] self.try_rename(ctx['tmpfilename'], ctx['filename']) fsize = os.path.getsize(encodeFilename(ctx['filename'])) -- cgit v1.2.3 From ea0c2f219c219de8f59f1ae82e106cec5911c56c Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Wed, 19 Apr 2017 18:34:25 +0100 Subject: [downloader/fragment] use a general file to store fragment download context --- youtube_dl/downloader/fragment.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 44a3c1040..80bb14d61 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -3,6 +3,7 @@ from __future__ import division, unicode_literals import os import time import io +import json from .common import FileDownloader from .http import HttpFD @@ -63,8 +64,10 @@ class FragmentFD(FileDownloader): def _append_fragment(self, ctx, frag_content): ctx['dest_stream'].write(frag_content) if not (ctx.get('live') or ctx['tmpfilename'] == '-'): - frag_index_stream, _ = sanitize_open(ctx['tmpfilename'] + '.fragindex', 'w') - frag_index_stream.write(compat_str(ctx['frag_index'])) + frag_index_stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'w') + frag_index_stream.write(json.dumps({ + 'frag_index': ctx['frag_index'] + })) frag_index_stream.close() def _prepare_frag_download(self, ctx): @@ -94,9 +97,10 @@ class FragmentFD(FileDownloader): if os.path.isfile(encodeFilename(tmpfilename)): open_mode = 'ab' resume_len = os.path.getsize(encodeFilename(tmpfilename)) - if os.path.isfile(encodeFilename(tmpfilename + '.fragindex')): - frag_index_stream, _ = sanitize_open(tmpfilename + '.fragindex', 'r') - frag_index = int(frag_index_stream.read()) + ytdl_filename = encodeFilename(self.ytdl_filename(ctx['filename'])) + if os.path.isfile(ytdl_filename): + frag_index_stream, _ = sanitize_open(ytdl_filename, 'r') + frag_index = json.loads(frag_index_stream.read())['frag_index'] frag_index_stream.close() dest_stream, tmpfilename = sanitize_open(tmpfilename, open_mode) @@ -167,8 +171,9 @@ class FragmentFD(FileDownloader): def _finish_frag_download(self, ctx): ctx['dest_stream'].close() - if os.path.isfile(encodeFilename(ctx['tmpfilename'] + '.fragindex')): - os.remove(encodeFilename(ctx['tmpfilename'] + '.fragindex')) + ytdl_filename = encodeFilename(self.ytdl_filename(ctx['filename'])) + if os.path.isfile(ytdl_filename): + os.remove(ytdl_filename) elapsed = time.time() - ctx['started'] self.try_rename(ctx['tmpfilename'], ctx['filename']) fsize = os.path.getsize(encodeFilename(ctx['filename'])) -- cgit v1.2.3 From 3e0304fe6e3a194cfb04f21aa261effb0850da40 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Sat, 22 Apr 2017 16:42:24 +0100 Subject: [downloader/fragment] use the documented names for fragment progress_hooks fields --- youtube_dl/downloader/fragment.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 80bb14d61..6c02cfc98 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -66,7 +66,9 @@ class FragmentFD(FileDownloader): if not (ctx.get('live') or ctx['tmpfilename'] == '-'): frag_index_stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'w') frag_index_stream.write(json.dumps({ - 'frag_index': ctx['frag_index'] + 'download': { + 'last_fragment_index': ctx['fragment_index'] + }, })) frag_index_stream.close() @@ -100,7 +102,7 @@ class FragmentFD(FileDownloader): ytdl_filename = encodeFilename(self.ytdl_filename(ctx['filename'])) if os.path.isfile(ytdl_filename): frag_index_stream, _ = sanitize_open(ytdl_filename, 'r') - frag_index = json.loads(frag_index_stream.read())['frag_index'] + frag_index = json.loads(frag_index_stream.read())['download']['last_fragment_index'] frag_index_stream.close() dest_stream, tmpfilename = sanitize_open(tmpfilename, open_mode) @@ -108,7 +110,7 @@ class FragmentFD(FileDownloader): 'dl': dl, 'dest_stream': dest_stream, 'tmpfilename': tmpfilename, - 'frag_index': frag_index, + 'fragment_index': frag_index, # Total complete fragments downloaded so far in bytes 'complete_frags_downloaded_bytes': resume_len, }) @@ -120,8 +122,8 @@ class FragmentFD(FileDownloader): state = { 'status': 'downloading', 'downloaded_bytes': ctx['complete_frags_downloaded_bytes'], - 'frag_index': ctx['frag_index'], - 'frag_count': total_frags, + 'fragment_index': ctx['fragment_index'], + 'fragment_count': total_frags, 'filename': ctx['filename'], 'tmpfilename': ctx['tmpfilename'], } @@ -144,12 +146,12 @@ class FragmentFD(FileDownloader): if not ctx['live']: estimated_size = ( (ctx['complete_frags_downloaded_bytes'] + frag_total_bytes) / - (state['frag_index'] + 1) * total_frags) + (state['fragment_index'] + 1) * total_frags) state['total_bytes_estimate'] = estimated_size if s['status'] == 'finished': - state['frag_index'] += 1 - ctx['frag_index'] = state['frag_index'] + state['fragment_index'] += 1 + ctx['fragment_index'] = state['fragment_index'] state['downloaded_bytes'] += frag_total_bytes - ctx['prev_frag_downloaded_bytes'] ctx['complete_frags_downloaded_bytes'] = state['downloaded_bytes'] ctx['prev_frag_downloaded_bytes'] = 0 -- cgit v1.2.3 From 4abdba643cc2d610fbbfe7ece9ee97a3df98ad33 Mon Sep 17 00:00:00 2001 From: Remita Amine Date: Sat, 22 Apr 2017 18:19:47 +0100 Subject: [downloader/fragment] remove unused code --- youtube_dl/downloader/fragment.py | 1 - 1 file changed, 1 deletion(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 6c02cfc98..0a3b1ece0 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -12,7 +12,6 @@ from ..utils import ( encodeFilename, sanitize_open, sanitized_Request, - compat_str, ) -- cgit v1.2.3 From d3f0687cf7b049b976420056e02c26b5d96adeed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Mon, 24 Apr 2017 02:54:17 +0700 Subject: [downloader/fragment] Use temp file for current fragment --- youtube_dl/downloader/fragment.py | 59 ++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 20 deletions(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 0a3b1ece0..62de0a75b 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -2,7 +2,6 @@ from __future__ import division, unicode_literals import os import time -import io import json from .common import FileDownloader @@ -48,28 +47,42 @@ class FragmentFD(FileDownloader): self._prepare_frag_download(ctx) self._start_frag_download(ctx) + def _read_ytdl_file(self, ctx): + stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'r') + ctx['fragment_index'] = json.loads(stream.read())['download']['current_fragment_index'] + stream.close() + + def _write_ytdl_file(self, ctx): + frag_index_stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'w') + frag_index_stream.write(json.dumps({ + 'download': { + 'current_fragment_index': ctx['fragment_index'] + }, + })) + frag_index_stream.close() + def _download_fragment(self, ctx, frag_url, info_dict, headers=None): - down = io.BytesIO() - success = ctx['dl'].download(down, { + fragment_filename = '%s-Frag%d' % (ctx['tmpfilename'], ctx['fragment_index']) + success = ctx['dl'].download(fragment_filename, { 'url': frag_url, 'http_headers': headers or info_dict.get('http_headers'), }) if not success: return False, None - frag_content = down.getvalue() + down, frag_sanitized = sanitize_open(fragment_filename, 'rb') + ctx['fragment_filename_sanitized'] = frag_sanitized + frag_content = down.read() down.close() return True, frag_content def _append_fragment(self, ctx, frag_content): - ctx['dest_stream'].write(frag_content) - if not (ctx.get('live') or ctx['tmpfilename'] == '-'): - frag_index_stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'w') - frag_index_stream.write(json.dumps({ - 'download': { - 'last_fragment_index': ctx['fragment_index'] - }, - })) - frag_index_stream.close() + try: + ctx['dest_stream'].write(frag_content) + finally: + if not (ctx.get('live') or ctx['tmpfilename'] == '-'): + self._write_ytdl_file(ctx) + os.remove(ctx['fragment_filename_sanitized']) + del ctx['fragment_filename_sanitized'] def _prepare_frag_download(self, ctx): if 'live' not in ctx: @@ -93,23 +106,29 @@ class FragmentFD(FileDownloader): tmpfilename = self.temp_name(ctx['filename']) open_mode = 'wb' resume_len = 0 - frag_index = 0 + # Establish possible resume length if os.path.isfile(encodeFilename(tmpfilename)): open_mode = 'ab' resume_len = os.path.getsize(encodeFilename(tmpfilename)) - ytdl_filename = encodeFilename(self.ytdl_filename(ctx['filename'])) - if os.path.isfile(ytdl_filename): - frag_index_stream, _ = sanitize_open(ytdl_filename, 'r') - frag_index = json.loads(frag_index_stream.read())['download']['last_fragment_index'] - frag_index_stream.close() + + ctx['fragment_index'] = 0 + if os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename']))): + self._read_ytdl_file(ctx) + else: + self._write_ytdl_file(ctx) + + if ctx['fragment_index'] > 0: + assert resume_len > 0 + else: + assert resume_len == 0 + dest_stream, tmpfilename = sanitize_open(tmpfilename, open_mode) ctx.update({ 'dl': dl, 'dest_stream': dest_stream, 'tmpfilename': tmpfilename, - 'fragment_index': frag_index, # Total complete fragments downloaded so far in bytes 'complete_frags_downloaded_bytes': resume_len, }) -- cgit v1.2.3 From 0eee52f34bfa55ba9d4ebfc4b4ba508c989f05b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Mon, 24 Apr 2017 03:09:08 +0700 Subject: Introduce --keep-fragments --- youtube_dl/downloader/fragment.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 62de0a75b..bcff94cbe 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -29,6 +29,8 @@ class FragmentFD(FileDownloader): and hlsnative only) skip_unavailable_fragments: Skip unavailable fragments (DASH and hlsnative only) + keep_fragments: Keep downloaded fragments on disk after downloading is + finished """ def report_retry_fragment(self, err, frag_index, count, retries): @@ -81,7 +83,8 @@ class FragmentFD(FileDownloader): finally: if not (ctx.get('live') or ctx['tmpfilename'] == '-'): self._write_ytdl_file(ctx) - os.remove(ctx['fragment_filename_sanitized']) + if not self.params.get('keep_fragments', False): + os.remove(ctx['fragment_filename_sanitized']) del ctx['fragment_filename_sanitized'] def _prepare_frag_download(self, ctx): -- cgit v1.2.3 From adb4b03cd583857d00fa03c050d1472bf44a0d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Mon, 24 Apr 2017 23:05:56 +0700 Subject: [downloader/fragment] Don't process ytdl file when it's not needed yet --- youtube_dl/downloader/fragment.py | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index bcff94cbe..25c8f18ec 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -49,6 +49,10 @@ class FragmentFD(FileDownloader): self._prepare_frag_download(ctx) self._start_frag_download(ctx) + @staticmethod + def __do_ytdl_file(ctx): + return not ctx['live'] and not ctx['tmpfilename'] == '-' + def _read_ytdl_file(self, ctx): stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'r') ctx['fragment_index'] = json.loads(stream.read())['download']['current_fragment_index'] @@ -81,7 +85,7 @@ class FragmentFD(FileDownloader): try: ctx['dest_stream'].write(frag_content) finally: - if not (ctx.get('live') or ctx['tmpfilename'] == '-'): + if self.__do_ytdl_file(ctx): self._write_ytdl_file(ctx) if not self.params.get('keep_fragments', False): os.remove(ctx['fragment_filename_sanitized']) @@ -115,16 +119,21 @@ class FragmentFD(FileDownloader): open_mode = 'ab' resume_len = os.path.getsize(encodeFilename(tmpfilename)) - ctx['fragment_index'] = 0 - if os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename']))): - self._read_ytdl_file(ctx) - else: - self._write_ytdl_file(ctx) + # Should be initialized before ytdl file check + ctx.update({ + 'tmpfilename': tmpfilename, + 'fragment_index': 0, + }) - if ctx['fragment_index'] > 0: - assert resume_len > 0 - else: - assert resume_len == 0 + if self.__do_ytdl_file(ctx): + if os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename']))): + self._read_ytdl_file(ctx) + else: + self._write_ytdl_file(ctx) + if ctx['fragment_index'] > 0: + assert resume_len > 0 + else: + assert resume_len == 0 dest_stream, tmpfilename = sanitize_open(tmpfilename, open_mode) @@ -194,9 +203,10 @@ class FragmentFD(FileDownloader): def _finish_frag_download(self, ctx): ctx['dest_stream'].close() - ytdl_filename = encodeFilename(self.ytdl_filename(ctx['filename'])) - if os.path.isfile(ytdl_filename): - os.remove(ytdl_filename) + if self.__do_ytdl_file(ctx): + ytdl_filename = encodeFilename(self.ytdl_filename(ctx['filename'])) + if os.path.isfile(ytdl_filename): + os.remove(ytdl_filename) elapsed = time.time() - ctx['started'] self.try_rename(ctx['tmpfilename'], ctx['filename']) fsize = os.path.getsize(encodeFilename(ctx['filename'])) -- cgit v1.2.3 From 290f64dbaa3a8c187d47b72b3c808bd52d15a6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Mon, 24 Apr 2017 23:50:20 +0700 Subject: [downloader/fragment] Improve .ytdl format and start documenting --- youtube_dl/downloader/fragment.py | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 25c8f18ec..50c8254a4 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -31,6 +31,24 @@ class FragmentFD(FileDownloader): Skip unavailable fragments (DASH and hlsnative only) keep_fragments: Keep downloaded fragments on disk after downloading is finished + + For each incomplete fragment download youtube-dl keeps on disk a special + bookkeeping file with download state and metadata (in future such files will + be used for any incomplete download handled by youtube-dl). This file is + used to properly handle resuming, check download file consistency and detect + potential errors. The file has a .ytdl extension and represents a standard + JSON file of the following format: + + extractor: + Dictionary of extractor related data. TBD. + + downloader: + Dictionary of downloader related data. May contain following data: + current_fragment: + Dictionary with current (being downloaded) fragment data: + index: Index of current fragment among all fragments + fragment_count: + Total count of fragments """ def report_retry_fragment(self, err, frag_index, count, retries): @@ -55,16 +73,19 @@ class FragmentFD(FileDownloader): def _read_ytdl_file(self, ctx): stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'r') - ctx['fragment_index'] = json.loads(stream.read())['download']['current_fragment_index'] + ctx['fragment_index'] = json.loads(stream.read())['downloader']['current_fragment']['index'] stream.close() def _write_ytdl_file(self, ctx): frag_index_stream, _ = sanitize_open(self.ytdl_filename(ctx['filename']), 'w') - frag_index_stream.write(json.dumps({ - 'download': { - 'current_fragment_index': ctx['fragment_index'] + downloader = { + 'current_fragment': { + 'index': ctx['fragment_index'], }, - })) + } + if ctx.get('fragment_count') is not None: + downloader['fragment_count'] = ctx['fragment_count'] + frag_index_stream.write(json.dumps({'downloader': downloader})) frag_index_stream.close() def _download_fragment(self, ctx, frag_url, info_dict, headers=None): -- cgit v1.2.3 From 85f6de25e46562f57be4447e9109be964e6515ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 25 Apr 2017 23:33:35 +0700 Subject: [downloader/fragment] Clarify current_fragment's index and mark as experimental --- youtube_dl/downloader/fragment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index 50c8254a4..bb9e82578 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -46,9 +46,11 @@ class FragmentFD(FileDownloader): Dictionary of downloader related data. May contain following data: current_fragment: Dictionary with current (being downloaded) fragment data: - index: Index of current fragment among all fragments + index: 0-based index of current fragment among all fragments fragment_count: Total count of fragments + + This feature is experimental and file format may change in future. """ def report_retry_fragment(self, err, frag_index, count, retries): -- cgit v1.2.3 From c0fa4245cea1dc493e5a72e36644114a2743039c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Fri, 28 Apr 2017 03:24:59 +0700 Subject: [downloader/fragment] Remove assert for resume_len when no fragments downloaded This may be incorrect due some header (e.g. flv header in f4m downloader) --- youtube_dl/downloader/fragment.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index bb9e82578..d529ae09a 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -155,8 +155,6 @@ class FragmentFD(FileDownloader): self._write_ytdl_file(ctx) if ctx['fragment_index'] > 0: assert resume_len > 0 - else: - assert resume_len == 0 dest_stream, tmpfilename = sanitize_open(tmpfilename, open_mode) -- cgit v1.2.3 From 50534b7158e0e1c842d05eae39fd6687a04a76e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sun, 30 Apr 2017 22:04:01 +0700 Subject: [downloader/fragment] PEP 8 --- youtube_dl/downloader/fragment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'youtube_dl/downloader/fragment.py') diff --git a/youtube_dl/downloader/fragment.py b/youtube_dl/downloader/fragment.py index d529ae09a..bccc8ecc1 100644 --- a/youtube_dl/downloader/fragment.py +++ b/youtube_dl/downloader/fragment.py @@ -49,7 +49,7 @@ class FragmentFD(FileDownloader): index: 0-based index of current fragment among all fragments fragment_count: Total count of fragments - + This feature is experimental and file format may change in future. """ -- cgit v1.2.3