diff options
| author | Jesús <heckyel@hyperbola.info> | 2021-10-18 15:24:21 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2021-10-18 15:24:21 -0500 |
| commit | 5122028a4bcac4ae577ef7fbd55ccad5cb34ef5e (patch) | |
| tree | 65209bc739db35e31f1c9b5b868eb5df4fe12ae3 /hypervideo_dl/downloader/rtmp.py | |
| parent | 27fe903c511691c078942bef5ee9a05a43b15c8f (diff) | |
| download | hypervideo-5122028a4bcac4ae577ef7fbd55ccad5cb34ef5e.tar.lz hypervideo-5122028a4bcac4ae577ef7fbd55ccad5cb34ef5e.tar.xz hypervideo-5122028a4bcac4ae577ef7fbd55ccad5cb34ef5e.zip | |
update from upstream
Diffstat (limited to 'hypervideo_dl/downloader/rtmp.py')
| -rw-r--r-- | hypervideo_dl/downloader/rtmp.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/hypervideo_dl/downloader/rtmp.py b/hypervideo_dl/downloader/rtmp.py index fbb7f51..6dca647 100644 --- a/hypervideo_dl/downloader/rtmp.py +++ b/hypervideo_dl/downloader/rtmp.py @@ -66,7 +66,7 @@ class RtmpFD(FileDownloader): 'eta': eta, 'elapsed': time_now - start, 'speed': speed, - }) + }, info_dict) cursor_in_new_line = False else: # no percent for live streams @@ -82,18 +82,20 @@ class RtmpFD(FileDownloader): 'status': 'downloading', 'elapsed': time_now - start, 'speed': speed, - }) + }, info_dict) cursor_in_new_line = False elif self.params.get('verbose', False): if not cursor_in_new_line: self.to_screen('') cursor_in_new_line = True self.to_screen('[rtmpdump] ' + line) - finally: + if not cursor_in_new_line: + self.to_screen('') + return proc.wait() + except BaseException: # Including KeyboardInterrupt + proc.kill() proc.wait() - if not cursor_in_new_line: - self.to_screen('') - return proc.returncode + raise url = info_dict['url'] player_url = info_dict.get('player_url') @@ -115,7 +117,7 @@ class RtmpFD(FileDownloader): # Check for rtmpdump first if not check_executable('rtmpdump', ['-h']): - self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.') + self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install') return False # Download using rtmpdump. rtmpdump returns exit code 2 when @@ -206,7 +208,7 @@ class RtmpFD(FileDownloader): 'filename': filename, 'status': 'finished', 'elapsed': time.time() - started, - }) + }, info_dict) return True else: self.to_stderr('\n') |