From af388ac3f4d1dfc1107e03bd5322d7021976d088 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 29 Jul 2022 14:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E7=9C=8B=E7=A8=BF=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/api/bilirecorder_blueprint.py |  8 ++++----
 templates/index.html                     | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

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 @@
             <td>当前上传状态</td>
             <td :class="collector.basic.uploading ? 'success' : 'warning'"></td>
         </tr>
+        <tr>
+            <td>上一个稿件名</td>
+            <td>{{ current_workflow.name }}</td>
+        </tr>
         </tbody>
     </table>
     <h2>配置状态</h2>
@@ -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) => {