diff --git a/controller/api/bilirecorder_blueprint.py b/controller/api/bilirecorder_blueprint.py index d5cf35c..5a9d24e 100644 --- a/controller/api/bilirecorder_blueprint.py +++ b/controller/api/bilirecorder_blueprint.py @@ -6,18 +6,18 @@ from typing import Optional from flask import Blueprint, jsonify, request, current_app -from config import BILILIVE_RECORDER_DIRECTORY, VIDEO_TITLE, XIGUALIVE_RECORDER_DIRECTORY, VIDEO_OUTPUT_DIR, VIDEO_DESC, \ +from config import BILILIVE_RECORDER_DIRECTORY, VIDEO_TITLE, XIGUALIVE_RECORDER_DIRECTORY, VIDEO_DESC, \ VIDEO_TAGS, VIDEO_TID from exception.danmaku import DanmakuException 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, INSTANCE as bilibili_instance +from workflow.bilibili import VideoPart 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") @@ -89,7 +89,7 @@ def safe_create_item(): bili_record_workflow_item.editing = False commit_item() bili_record_workflow_item = Workflow() - bili_record_workflow_item.name = VIDEO_TITLE.format(datetime.now().strftime("%Y%m%d")) + bili_record_workflow_item.name = VIDEO_TITLE.format(datetime.utcnow().strftime("%Y%m%d")) bili_record_workflow_item.automatic = True bili_record_workflow_item.editing = True db.session.commit() diff --git a/templates/index.html b/templates/index.html index ac91d4d..0e22acd 100644 --- a/templates/index.html +++ b/templates/index.html @@ -57,6 +57,10 @@ 当前上传状态 + + 上一个稿件名 + {{ current_workflow.name }} +

配置状态

@@ -295,7 +299,11 @@ bili_dir: "", xigua_dir: "", } - } + }, + current_workflow: { + id: 0, + name: "", + }, } }, created() { @@ -309,6 +317,11 @@ }).then((response) => { this.collector.uploader = response.data; }) + axios({ + url: "/api/bilirecorder/" + }).then((response) => { + this.current_workflow = response.data; + }) axios({ url: "/api/config/" }).then((response) => {