From 0b0d2ce15fbdbb8d85d9e67d71e8a3a94d2ee117 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 27 Jul 2022 09:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90=E7=89=87?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=EF=BC=8C=E5=85=81=E8=AE=B8=E8=BD=AC=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/api/bilirecorder_blueprint.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/controller/api/bilirecorder_blueprint.py b/controller/api/bilirecorder_blueprint.py index 10dfa93..d5cf35c 100644 --- a/controller/api/bilirecorder_blueprint.py +++ b/controller/api/bilirecorder_blueprint.py @@ -12,17 +12,17 @@ from exception.danmaku import DanmakuException from model import db from model.DanmakuClip import DanmakuClip from model.VideoClip import VideoClip -from model.VideoPart import VideoPart from model.Workflow import Workflow from workflow.danmaku import get_file_start from workflow.video import get_video_real_duration, duration_str_to_float from workflow.worker import do_workflow from workflow.bilibili import IS_LIVING, INSTANCE as bilibili_instance +from workflow.bilibili import VideoPart blueprint = Blueprint("api_bilirecorder", __name__, url_prefix="/api/bilirecorder") bili_record_workflow_item: Optional[Workflow] = None -pool = ProcessPoolExecutor(max_workers=4) +pool = ProcessPoolExecutor(max_workers=1) def auto_submit_task(): global bili_record_workflow_item @@ -51,11 +51,14 @@ def auto_submit_task(): if _result: # start uploading bilibili_instance.login() - bilibili_instance.upload(parts=[os.path.join(_item['base_path'], _item['file']) for _item in _result], - title=bili_record_workflow_item.name, - desc=VIDEO_DESC, - tid=VIDEO_TID, - tag=VIDEO_TAGS) + bilibili_instance.upload( + parts=[VideoPart(os.path.join(_item['base_path'], _item['file']), _item['file']) for _item in + _result], + title=bili_record_workflow_item.name, + desc=VIDEO_DESC, + tid=VIDEO_TID, + tag=VIDEO_TAGS, + no_reprint=0) _future.add_done_callback(_encode_finish_callback) else: print("[-]Workflow:", bili_record_workflow_item.id, "; Video:", video_clip.full_path, "; No Danmaku")