From 8e897ed283be889dc293522eca6435f081d3a307 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Thu, 24 Jun 2021 17:54:05 +0530 Subject: [PATCH] [fragment] Return status of download correctly --- yt_dlp/downloader/dash.py | 7 ++----- yt_dlp/downloader/fragment.py | 1 + yt_dlp/downloader/hls.py | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/yt_dlp/downloader/dash.py b/yt_dlp/downloader/dash.py index 90c7a3ace2..ce4001a097 100644 --- a/yt_dlp/downloader/dash.py +++ b/yt_dlp/downloader/dash.py @@ -57,9 +57,6 @@ def real_download(self, filename, info_dict): # TODO: Make progress updates work without hooking twice # for ph in self._progress_hooks: # fd.add_progress_hook(ph) - success = fd.real_download(filename, info_copy) - if not success: - return False + return fd.real_download(filename, info_copy) else: - self.download_and_append_fragments(ctx, fragments_to_download, info_dict) - return True + return self.download_and_append_fragments(ctx, fragments_to_download, info_dict) diff --git a/yt_dlp/downloader/fragment.py b/yt_dlp/downloader/fragment.py index a530484b56..c8d4d33aae 100644 --- a/yt_dlp/downloader/fragment.py +++ b/yt_dlp/downloader/fragment.py @@ -428,3 +428,4 @@ def _download_fragment(fragment): return False self._finish_frag_download(ctx) + return True diff --git a/yt_dlp/downloader/hls.py b/yt_dlp/downloader/hls.py index a3cd18b77a..fdc4f7aa81 100644 --- a/yt_dlp/downloader/hls.py +++ b/yt_dlp/downloader/hls.py @@ -250,9 +250,7 @@ def is_ad_fragment_end(s): # TODO: Make progress updates work without hooking twice # for ph in self._progress_hooks: # fd.add_progress_hook(ph) - success = fd.real_download(filename, info_copy) - if not success: - return False + return fd.real_download(filename, info_copy) else: if is_webvtt: def pack_fragment(frag_content, frag_index): @@ -323,5 +321,4 @@ def pack_fragment(frag_content, frag_index): return output.getvalue().encode('utf-8') else: pack_fragment = None - self.download_and_append_fragments(ctx, fragments, info_dict, pack_fragment) - return True + return self.download_and_append_fragments(ctx, fragments, info_dict, pack_fragment)