From 8298b908b4f9a059bd3dbe2b2efb081eff8ed860 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 17 May 2022 18:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0output=5Fdir=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/api/collector_blueprint.py | 3 ++- templates/index.html | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/controller/api/collector_blueprint.py b/controller/api/collector_blueprint.py index 7dfcd85..5759c2e 100644 --- a/controller/api/collector_blueprint.py +++ b/controller/api/collector_blueprint.py @@ -4,7 +4,7 @@ import platform import psutil from flask import Blueprint, jsonify -from config import DANMAKU_FACTORY_EXEC, FFMPEG_EXEC, BILILIVE_RECORDER_DIRECTORY, XIGUALIVE_RECORDER_DIRECTORY +from config import DANMAKU_FACTORY_EXEC, FFMPEG_EXEC, BILILIVE_RECORDER_DIRECTORY, XIGUALIVE_RECORDER_DIRECTORY, VIDEO_OUTPUT_DIR from util.system import check_exec blueprint = Blueprint("api_collector", __name__, url_prefix="/api/collector") @@ -52,6 +52,7 @@ def _better_size_unit(bytes: int) -> str: def collect_basic_status(): return jsonify({ 'disk': { + 'output': _get_disk_info(VIDEO_OUTPUT_DIR), 'work': _get_disk_info(os.path.abspath(".")), 'bili': _get_disk_info(BILILIVE_RECORDER_DIRECTORY), 'xigua': _get_disk_info(XIGUALIVE_RECORDER_DIRECTORY) diff --git a/templates/index.html b/templates/index.html index 5b25b86..5a07359 100644 --- a/templates/index.html +++ b/templates/index.html @@ -123,7 +123,7 @@ - 工作目录 + 当前目录 ~ @@ -146,6 +146,14 @@ {{ collector.basic.disk.xigua.free }} / {{ collector.basic.disk.xigua.total }} + + 压制输出目录 + {{ config.recorder.output_dir }} + + + + {{ collector.basic.disk.output.free }} / {{ collector.basic.disk.output.total }} +