提交 badec519 authored 作者: zw.wang's avatar zw.wang

fix: [record] 修复录制任务续录的文件不存在问题

上级 8a4eef48
...@@ -150,7 +150,7 @@ def update_video_info(cursor, conn, db_table, video_id, status, ...@@ -150,7 +150,7 @@ def update_video_info(cursor, conn, db_table, video_id, status,
'expired_time=date_add(now(),interval 31 day)'\ 'expired_time=date_add(now(),interval 31 day)'\
.format(file_name, video_url, video_resolution, recovered_time) .format(file_name, video_url, video_resolution, recovered_time)
if retry_info: if retry_info:
sub_set += ', retry_info=\'{}\''.format(json.dumps(retry_info, ensure_ascii=False)) sub_set += ', retry_info=\'{}\''.format(json.dumps(retry_info, ensure_ascii=False).replace("\'", "\\'"))
if next_retry_time: if next_retry_time:
sub_set += ', next_retry_time="{}"'.format(next_retry_time) sub_set += ', next_retry_time="{}"'.format(next_retry_time)
if remark: if remark:
......
...@@ -171,7 +171,7 @@ class ProcessMessage: ...@@ -171,7 +171,7 @@ class ProcessMessage:
part_file_name = os.path.join(video_path, 'ISC_{}_{}_{}_{}.mp4'.format( part_file_name = os.path.join(video_path, 'ISC_{}_{}_{}_{}.mp4'.format(
self.body['camera_code'], self.body['camera_code'],
event['start_time'].strftime('%Y%m%dT%H%M%S'), event['start_time'].strftime('%Y%m%dT%H%M%S'),
event['recovered_time'].strftime('%Y%m%dT%H%M%S'), '00' event['recovered_time'].strftime('%Y%m%dT%H%M%S'), '0'
)) ))
# 下载上次失败的视频文件 # 下载上次失败的视频文件
try: try:
...@@ -292,7 +292,7 @@ class ProcessMessage: ...@@ -292,7 +292,7 @@ class ProcessMessage:
self.write_retry_info_to_influx(self.body['camera_code'], res.get('remark')) self.write_retry_info_to_influx(self.body['camera_code'], res.get('remark'))
return res return res
part_num = retry_count = 0 part_num = retry_count = 1
is_completed = False is_completed = False
part_files_set = part_files_set or set() part_files_set = part_files_set or set()
while retry_count < 6: while retry_count < 6:
...@@ -319,7 +319,7 @@ class ProcessMessage: ...@@ -319,7 +319,7 @@ class ProcessMessage:
start_time = new_start_time start_time = new_start_time
part_num += 1 part_num += 1
retry_count = 0 retry_count = 1
else: else:
# 录制完成 # 录制完成
part_files_set.add(file_info['file_name']) part_files_set.add(file_info['file_name'])
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论