q792602257/my-video-workflow
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

随便更改了下，希望不要老是投多个稿件

Browse Source
This commit is contained in:
Jerry Yan
2022-10-24 14:07:44 +08:00
parent 79a49de4d5
commit 0b01f1d77d
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controller/api/bilirecorder_blueprint.py
View File

@ -13,7 +13,7 @@ from model import db
from model.DanmakuClip import DanmakuClip
from model.VideoClip import VideoClip
from model.Workflow import Workflow
from workflow.bilibili import IS_LIVING, IS_UPLOADING, INSTANCE as bilibili_instance
from workflow.bilibili import IS_LIVING, IS_UPLOADING, INSTANCE as bilibili_instance, IS_ENCODING
from workflow.bilibili import VideoPart
from workflow.danmaku import get_file_start
from workflow.video import get_video_real_duration, duration_str_to_float
@ -35,13 +35,15 @@ def auto_submit_task():
if len(bili_record_workflow_item.video_clips) == 0:
print("[!]Auto Submit Fail: No Video Clips")
return
bilibili_instance.login()
if VIDEO_ENABLED:
bilibili_instance.login()
video_title = bili_record_workflow_item.name
_future = None
for video_clip in bili_record_workflow_item.video_clips:
if len(video_clip.danmaku_clips) > 0:
print("[+]Workflow:", bili_record_workflow_item.id, "; Video:", video_clip.full_path)
_started = True
IS_ENCODING.set()
_future = pool.submit(
do_workflow,
video_clip.full_path,
@ -51,6 +53,7 @@ def auto_submit_task():
clear_item()
if VIDEO_ENABLED:
def _encode_finish_callback(_f: "Future"):
IS_ENCODING.clear()
_result = _f.result()
if _result:
# start uploading
@ -63,9 +66,9 @@ def auto_submit_task():
_future.add_done_callback(_encode_finish_callback)
else:
print("[-]Workflow:", bili_record_workflow_item.id, "; Video:", video_clip.full_path, "; No Danmaku")
if _future is not None:
if VIDEO_ENABLED and _future is not None:
def _on_upload_finish(_f: "Future"):
if IS_UPLOADING.is_set() or IS_LIVING.is_set():
if IS_UPLOADING.is_set() or IS_LIVING.is_set() or IS_ENCODING.is_set():
return
bilibili_instance.finish_upload(
title=video_title,
@ -73,7 +76,6 @@ def auto_submit_task():
tid=VIDEO_TID,
tag=VIDEO_TAGS,
no_reprint=0)
bilibili_instance.clear()
_future.add_done_callback(_on_upload_finish)