改改bug

This commit is contained in:
2025-01-13 10:33:36 +08:00
parent ce469dacf2
commit 92160b05ea
5 changed files with 22 additions and 18 deletions

View File

@ -139,6 +139,7 @@ def report_task_failed(task_info):
def upload_task_file(task_info, ffmpeg_task):
logger.info("开始上传文件: %s", task_info.get("id"))
try:
response = session.post('{0}/{1}/uploadUrl'.format(os.getenv('API_ENDPOINT'), task_info.get("id")), json={
'accessKey': os.getenv('ACCESS_KEY'),
@ -149,10 +150,13 @@ def upload_task_file(task_info, ffmpeg_task):
return False
data = response.json()
url = data.get('data', "")
logger.info("开始上传文件: %s%s", task_info.get("id"), url)
try:
with open(ffmpeg_task.get_output_file(), 'rb') as f:
requests.put(url, data=f)
except requests.RequestException as e:
logger.error("上传失败!", e)
return False
return True
finally:
logger.info("上传文件结束: %s", task_info.get("id"))
return True

View File

@ -23,11 +23,11 @@ def to_annexb(file):
def start_render(ffmpeg_task: FfmpegTask):
logger.info(ffmpeg_task)
logger.info(ffmpeg_task.get_ffmpeg_args())
if not ffmpeg_task.need_run():
ffmpeg_task.set_output_file(ffmpeg_task.input_file[0])
return True
ffmpeg_args = ffmpeg_task.get_ffmpeg_args()
logger.info(ffmpeg_args)
if len(ffmpeg_args) == 0:
ffmpeg_task.set_output_file(ffmpeg_task.input_file[0])
return True