commit 9b0b62753432244fd062d99cc5dc604d6bad7877
parent 61cb66830f5097b528aab381eb6b343a89f73cbc
Author: Sergey M․ <dstftw@gmail.com>
Date:   Fri, 15 Jun 2018 02:59:15 +0700

[downloader/rtmp] Fix downloading in verbose mode (closes #16736)

Diffstat:
Myoutube_dl/downloader/rtmp.py | 13++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py @@ -24,13 +24,12 @@ class RtmpFD(FileDownloader): def real_download(self, filename, info_dict): def run_rtmpdump(args): start = time.time() + resume_percent = None + resume_downloaded_data_len = None proc = subprocess.Popen(args, stderr=subprocess.PIPE) cursor_in_new_line = True - - def dl(): - resume_percent = None - resume_downloaded_data_len = None - proc_stderr_closed = False + proc_stderr_closed = False + try: while not proc_stderr_closed: # read line from stderr line = '' @@ -90,12 +89,8 @@ class RtmpFD(FileDownloader): self.to_screen('') cursor_in_new_line = True self.to_screen('[rtmpdump] ' + line) - - try: - dl() finally: proc.wait() - if not cursor_in_new_line: self.to_screen('') return proc.returncode