[downloader/rtmp] Gracefully handle live streams interrupted by user
Sergey M․
parent
68217024e8
commit
ddd8486a44
|
|
@ -24,71 +24,78 @@ 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()
|
||||||
resume_percent = None
|
|
||||||
resume_downloaded_data_len = None
|
|
||||||
proc = subprocess.Popen(args, stderr=subprocess.PIPE)
|
proc = subprocess.Popen(args, stderr=subprocess.PIPE)
|
||||||
cursor_in_new_line = True
|
cursor_in_new_line = True
|
||||||
proc_stderr_closed = False
|
|
||||||
while not proc_stderr_closed:
|
def dl():
|
||||||
# read line from stderr
|
resume_percent = None
|
||||||
line = ''
|
resume_downloaded_data_len = None
|
||||||
while True:
|
proc_stderr_closed = False
|
||||||
char = proc.stderr.read(1)
|
while not proc_stderr_closed:
|
||||||
if not char:
|
# read line from stderr
|
||||||
proc_stderr_closed = True
|
line = ''
|
||||||
break
|
while True:
|
||||||
if char in [b'\r', b'\n']:
|
char = proc.stderr.read(1)
|
||||||
break
|
if not char:
|
||||||
line += char.decode('ascii', 'replace')
|
proc_stderr_closed = True
|
||||||
if not line:
|
break
|
||||||
# proc_stderr_closed is True
|
if char in [b'\r', b'\n']:
|
||||||
continue
|
break
|
||||||
mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec \(([0-9]{1,2}\.[0-9])%\)', line)
|
line += char.decode('ascii', 'replace')
|
||||||
if mobj:
|
if not line:
|
||||||
downloaded_data_len = int(float(mobj.group(1)) * 1024)
|
# proc_stderr_closed is True
|
||||||
percent = float(mobj.group(2))
|
continue
|
||||||
if not resume_percent:
|
mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec \(([0-9]{1,2}\.[0-9])%\)', line)
|
||||||
resume_percent = percent
|
|
||||||
resume_downloaded_data_len = downloaded_data_len
|
|
||||||
time_now = time.time()
|
|
||||||
eta = self.calc_eta(start, time_now, 100 - resume_percent, percent - resume_percent)
|
|
||||||
speed = self.calc_speed(start, time_now, downloaded_data_len - resume_downloaded_data_len)
|
|
||||||
data_len = None
|
|
||||||
if percent > 0:
|
|
||||||
data_len = int(downloaded_data_len * 100 / percent)
|
|
||||||
self._hook_progress({
|
|
||||||
'status': 'downloading',
|
|
||||||
'downloaded_bytes': downloaded_data_len,
|
|
||||||
'total_bytes_estimate': data_len,
|
|
||||||
'tmpfilename': tmpfilename,
|
|
||||||
'filename': filename,
|
|
||||||
'eta': eta,
|
|
||||||
'elapsed': time_now - start,
|
|
||||||
'speed': speed,
|
|
||||||
})
|
|
||||||
cursor_in_new_line = False
|
|
||||||
else:
|
|
||||||
# no percent for live streams
|
|
||||||
mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec', line)
|
|
||||||
if mobj:
|
if mobj:
|
||||||
downloaded_data_len = int(float(mobj.group(1)) * 1024)
|
downloaded_data_len = int(float(mobj.group(1)) * 1024)
|
||||||
|
percent = float(mobj.group(2))
|
||||||
|
if not resume_percent:
|
||||||
|
resume_percent = percent
|
||||||
|
resume_downloaded_data_len = downloaded_data_len
|
||||||
time_now = time.time()
|
time_now = time.time()
|
||||||
speed = self.calc_speed(start, time_now, downloaded_data_len)
|
eta = self.calc_eta(start, time_now, 100 - resume_percent, percent - resume_percent)
|
||||||
|
speed = self.calc_speed(start, time_now, downloaded_data_len - resume_downloaded_data_len)
|
||||||
|
data_len = None
|
||||||
|
if percent > 0:
|
||||||
|
data_len = int(downloaded_data_len * 100 / percent)
|
||||||
self._hook_progress({
|
self._hook_progress({
|
||||||
|
'status': 'downloading',
|
||||||
'downloaded_bytes': downloaded_data_len,
|
'downloaded_bytes': downloaded_data_len,
|
||||||
|
'total_bytes_estimate': data_len,
|
||||||
'tmpfilename': tmpfilename,
|
'tmpfilename': tmpfilename,
|
||||||
'filename': filename,
|
'filename': filename,
|
||||||
'status': 'downloading',
|
'eta': eta,
|
||||||
'elapsed': time_now - start,
|
'elapsed': time_now - start,
|
||||||
'speed': speed,
|
'speed': speed,
|
||||||
})
|
})
|
||||||
cursor_in_new_line = False
|
cursor_in_new_line = False
|
||||||
elif self.params.get('verbose', False):
|
else:
|
||||||
if not cursor_in_new_line:
|
# no percent for live streams
|
||||||
self.to_screen('')
|
mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec', line)
|
||||||
cursor_in_new_line = True
|
if mobj:
|
||||||
self.to_screen('[rtmpdump] ' + line)
|
downloaded_data_len = int(float(mobj.group(1)) * 1024)
|
||||||
proc.wait()
|
time_now = time.time()
|
||||||
|
speed = self.calc_speed(start, time_now, downloaded_data_len)
|
||||||
|
self._hook_progress({
|
||||||
|
'downloaded_bytes': downloaded_data_len,
|
||||||
|
'tmpfilename': tmpfilename,
|
||||||
|
'filename': filename,
|
||||||
|
'status': 'downloading',
|
||||||
|
'elapsed': time_now - start,
|
||||||
|
'speed': speed,
|
||||||
|
})
|
||||||
|
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)
|
||||||
|
|
||||||
|
try:
|
||||||
|
dl()
|
||||||
|
finally:
|
||||||
|
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
|
||||||
|
|
@ -163,7 +170,13 @@ class RtmpFD(FileDownloader):
|
||||||
RD_INCOMPLETE = 2
|
RD_INCOMPLETE = 2
|
||||||
RD_NO_CONNECT = 3
|
RD_NO_CONNECT = 3
|
||||||
|
|
||||||
retval = run_rtmpdump(args)
|
try:
|
||||||
|
retval = run_rtmpdump(args)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
if not info_dict.get('is_live'):
|
||||||
|
raise
|
||||||
|
retval = RD_SUCCESS
|
||||||
|
self.to_screen('\n[rtmpdump] Interrupted by user')
|
||||||
|
|
||||||
if retval == RD_NO_CONNECT:
|
if retval == RD_NO_CONNECT:
|
||||||
self.report_error('[rtmpdump] Could not connect to RTMP server.')
|
self.report_error('[rtmpdump] Could not connect to RTMP server.')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue