jcgruenhage/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Sergey M․ 2018-06-15 02:59:15 +07:00
parent 61cb66830f
commit 9b0b627534
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
youtube_dl/downloader/rtmp.py
View file

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