bf1942/bili-sync-ai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 重构视频下载任务的触发逻辑，由简单的 tokio::sleep 迁移至调度器调度 (#529)

Browse Source
This commit is contained in:
ᴀᴍᴛᴏᴀᴇʀ
2025-11-09 01:11:42 +08:00
committed by GitHub
parent c69a88f1da
commit 170bd14fe3
20 changed files with 544 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Cargo.lock generated
View File

@@ -358,6 +358,7 @@ dependencies = [
"chrono",
"clap",
"cookie",
"croner",
"dashmap",
"dirs",
"enum_dispatch",
@@ -386,6 +387,7 @@ dependencies = [
"sysinfo",
"thiserror 2.0.17",
"tokio",
"tokio-cron-scheduler",
"tokio-stream",
"tokio-util",
"toml",
@@ -602,6 +604,16 @@ dependencies = [
"windows-link 0.2.1",
]
[[package]]
name = "chrono-tz"
version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3"
dependencies = [
"chrono",
"phf",
]
[[package]]
name = "clap"
version = "4.5.48"
@@ -736,6 +748,17 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "croner"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aa42bcd3d846ebf66e15bd528d1087f75d1c6c1c66ebff626178a106353c576"
dependencies = [
"chrono",
"derive_builder",
"strum 0.27.2",
]
[[package]]
name = "crossbeam-queue"
version = "0.3.11"
@@ -2017,6 +2040,17 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-derive"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
]
[[package]]
name = "num-integer"
version = "0.1.46"
@@ -2242,6 +2276,24 @@ dependencies = [
"serde",
]
[[package]]
name = "phf"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
dependencies = [
"phf_shared",
]
[[package]]
name = "phf_shared"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
dependencies = [
"siphasher",
]
[[package]]
name = "pin-project-lite"
version = "0.2.14"
@@ -3274,6 +3326,12 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
[[package]]
name = "siphasher"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
[[package]]
name = "slab"
version = "0.4.9"
@@ -3827,6 +3885,22 @@ dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "tokio-cron-scheduler"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f50e41f200fd8ed426489bd356910ede4f053e30cebfbd59ef0f856f0d7432a"
dependencies = [
"chrono",
"chrono-tz",
"croner",
"num-derive",
"num-traits",
"tokio",
"tracing",
"uuid",
]
[[package]]
name = "tokio-macros"
version = "2.5.0"

2
Cargo.toml
View File

@@ -26,6 +26,7 @@ built = { version = "0.7.7", features = ["git2", "chrono"] }
chrono = { version = "0.4.42", features = ["serde"] }
clap = { version = "4.5.48", features = ["env", "string"] }
cookie = "0.18.1"
croner = "3.0.1"
dashmap = "6.1.0"
derivative = "2.2.0"
dirs = "6.0.0"
@@ -69,6 +70,7 @@ strum = { version = "0.27.2", features = ["derive"] }
sysinfo = "0.37.2"
thiserror = "2.0.17"
tokio = { version = "1.47.1", features = ["full"] }
tokio-cron-scheduler = "0.15.1"
tokio-stream = { version = "0.1.17", features = ["sync"] }
tokio-util = { version = "0.7.16", features = ["io", "rt"] }
toml = "0.9.7"

2
crates/bili_sync/Cargo.toml
View File

@@ -21,6 +21,7 @@ bili_sync_migration = { workspace = true }
chrono = { workspace = true }
clap = { workspace = true }
cookie = { workspace = true }
croner = { workspace = true }
dashmap = { workspace = true }
dirs = { workspace = true }
enum_dispatch = { workspace = true }
@@ -48,6 +49,7 @@ strum = { workspace = true }
sysinfo = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tokio-cron-scheduler = { workspace = true }
tokio-stream = { workspace = true }
tokio-util = { workspace = true }
toml = { workspace = true }

2
crates/bili_sync/src/api/routes/mod.rs
View File

@@ -13,6 +13,7 @@ use crate::config::VersionedConfig;
mod config;
mod dashboard;
mod me;
mod task;
mod video_sources;
mod videos;
mod ws;
@@ -28,6 +29,7 @@ pub fn router() -> Router {
.merge(videos::router())
.merge(dashboard::router())
.merge(ws::router())
.merge(task::router())
.layer(middleware::from_fn(auth)),
)
}

15
crates/bili_sync/src/api/routes/task/mod.rs Normal file
View File

@@ -0,0 +1,15 @@
use anyhow::Result;
use axum::Router;
use axum::routing::post;
use crate::api::wrapper::{ApiError, ApiResponse};
use crate::task::DownloadTaskManager;
pub(super) fn router() -> Router {
Router::new().route("/task/download", post(new_download_task))
}
pub async fn new_download_task() -> Result<ApiResponse<bool>, ApiError> {
DownloadTaskManager::get().oneshot().await?;
Ok(ApiResponse::ok(true))
}

4
crates/bili_sync/src/api/routes/ws/mod.rs
View File

@@ -26,7 +26,7 @@ use tokio_util::sync::CancellationToken;
use uuid::Uuid;
use crate::api::response::SysInfo;
use crate::utils::task_notifier::{TASK_STATUS_NOTIFIER, TaskStatus};
use crate::task::{DownloadTaskManager, TaskStatus};
static WEBSOCKET_HANDLER: LazyLock<WebSocketHandler> = LazyLock::new(WebSocketHandler::new);
@@ -209,7 +209,7 @@ impl WebSocketHandler {
let cancel_token = CancellationToken::new();
tokio::spawn(
async move {
let mut stream = WatchStream::new(TASK_STATUS_NOTIFIER.subscribe()).map(ServerEvent::Tasks);
let mut stream = WatchStream::new(DownloadTaskManager::get().subscribe()).map(ServerEvent::Tasks);
while let Some(event) = stream.next().await {
if let Err(e) = tx.send(event).await {
error!("Failed to send task status: {:?}", e);

26
crates/bili_sync/src/config/current.rs
View File

@@ -2,6 +2,7 @@ use std::path::PathBuf;
use std::sync::LazyLock;
use anyhow::{Result, bail};
use croner::parser::CronParser;
use sea_orm::DatabaseConnection;
use serde::{Deserialize, Serialize};
use validator::Validate;
@@ -9,7 +10,8 @@ use validator::Validate;
use crate::bilibili::{Credential, DanmakuOption, FilterOption};
use crate::config::default::{default_auth_token, default_bind_address, default_time_format};
use crate::config::item::{
ConcurrentLimit, NFOTimeType, SkipOption, default_collection_path, default_favorite_path, default_submission_path,
ConcurrentLimit, NFOTimeType, SkipOption, Trigger, default_collection_path, default_favorite_path,
default_submission_path,
};
use crate::notifier::Notifier;
use crate::utils::model::{load_db_config, save_db_config};
@@ -36,7 +38,7 @@ pub struct Config {
pub collection_default_path: String,
#[serde(default = "default_submission_path")]
pub submission_default_path: String,
pub interval: u64,
pub interval: Trigger,
pub upper_path: PathBuf,
pub nfo_time_type: NFOTimeType,
pub concurrent_limit: ConcurrentLimit,
@@ -77,6 +79,24 @@ impl Config {
if !(self.concurrent_limit.video > 0 && self.concurrent_limit.page > 0) {
errors.push("video 和 page 允许的并发数必须大于 0");
}
match &self.interval {
Trigger::Interval(secs) => {
if *secs <= 60 {
errors.push("下载任务执行间隔时间必须大于 60 秒");
}
}
Trigger::Cron(cron) => {
if CronParser::builder()
.seconds(croner::parser::Seconds::Required)
.dom_and_dow(true)
.build()
.parse(cron)
.is_err()
{
errors.push("Cron 表达式无效，正确格式为“秒 分 时 日 月 周”");
}
}
};
if !errors.is_empty() {
bail!(
errors
@@ -105,7 +125,7 @@ impl Default for Config {
favorite_default_path: default_favorite_path(),
collection_default_path: default_collection_path(),
submission_default_path: default_submission_path(),
interval: 1200,
interval: Trigger::default(),
upper_path: CONFIG_DIR.join("upper_face"),
nfo_time_type: NFOTimeType::FavTime,
concurrent_limit: ConcurrentLimit::default(),

13
crates/bili_sync/src/config/item.rs
View File

@@ -69,6 +69,19 @@ pub struct SkipOption {
pub no_subtitle: bool,
}
#[derive(Serialize, Deserialize, Clone)]
#[serde(untagged)]
pub enum Trigger {
Interval(u64),
Cron(String),
}
impl Default for Trigger {
fn default() -> Self {
Trigger::Interval(1200)
}
}
pub trait PathSafeTemplate {
fn path_safe_register(&mut self, name: &'static str, template: impl Into<String>) -> Result<()>;
fn path_safe_render(&self, name: &'static str, data: &serde_json::Value) -> Result<String>;

2
crates/bili_sync/src/config/mod.rs
View File

@@ -9,6 +9,6 @@ mod versioned_config;
pub use crate::config::args::{ARGS, version};
pub use crate::config::current::{CONFIG_DIR, Config};
pub use crate::config::handlebar::TEMPLATE;
pub use crate::config::item::{ConcurrentDownloadLimit, NFOTimeType, PathSafeTemplate, RateLimit};
pub use crate::config::item::{ConcurrentDownloadLimit, NFOTimeType, PathSafeTemplate, RateLimit, Trigger};
pub use crate::config::versioned_cache::VersionedCache;
pub use crate::config::versioned_config::VersionedConfig;

74
crates/bili_sync/src/config/versioned_config.rs
View File

@@ -1,6 +1,6 @@
use std::sync::Arc;
use anyhow::{Result, anyhow, bail};
use anyhow::{Result, bail};
use arc_swap::{ArcSwap, Guard};
use sea_orm::DatabaseConnection;
use tokio::sync::{OnceCell, watch};
@@ -19,48 +19,48 @@ pub struct VersionedConfig {
impl VersionedConfig {
/// 初始化全局的 `VersionedConfig`，初始化失败或者已初始化过则返回错误
pub async fn init(connection: &DatabaseConnection) -> Result<()> {
let mut config = match Config::load_from_database(connection).await? {
Some(Ok(config)) => config,
Some(Err(e)) => bail!("解析数据库配置失败： {}", e),
None => {
if CONFIG_DIR.join("config.toml").exists() {
// 数据库中没有配置，但旧版配置文件存在，说明是从 2.6.0 之前的版本直接升级的
bail!(
"当前版本已移除配置文件的迁移逻辑，不再支持从配置文件加载配置。\n\
如果你正在运行 2.6.0 之前的版本，请先升级至 2.6.x 或 2.7.x，\n\
启动时会自动将配置文件迁移至数据库，然后再升级至最新版本。"
);
}
let config = Config::default();
warn!(
"生成 auth_token：{}，可使用该 token 登录 web UI，该信息仅在首次运行时打印",
config.auth_token
);
config.save_to_database(connection).await?;
config
}
};
// version 本身不具有实际意义，仅用于并发更新时的版本控制，在初始化时可以直接清空
config.version = 0;
let versioned_config = VersionedConfig::new(config);
pub async fn init(connection: &DatabaseConnection) -> Result<&'static VersionedConfig> {
VERSIONED_CONFIG
.set(versioned_config)
.map_err(|e| anyhow!("VERSIONED_CONFIG has already been initialized: {}", e))?;
Ok(())
.get_or_try_init(|| async move {
let mut config = match Config::load_from_database(connection).await? {
Some(Ok(config)) => config,
Some(Err(e)) => bail!("解析数据库配置失败： {}", e),
None => {
if CONFIG_DIR.join("config.toml").exists() {
// 数据库中没有配置，但旧版配置文件存在，说明是从 2.6.0 之前的版本直接升级的
bail!(
"当前版本已移除配置文件的迁移逻辑，不再支持从配置文件加载配置。\n\
如果你正在运行 2.6.0 之前的版本，请先升级至 2.6.x 或 2.7.x，\n\
启动时会自动将配置文件迁移至数据库，然后再升级至最新版本。"
);
}
let config = Config::default();
warn!(
"生成 auth_token：{}，可使用该 token 登录 web UI，该信息仅在首次运行时打印",
config.auth_token
);
config.save_to_database(connection).await?;
config
}
};
// version 本身不具有实际意义，仅用于并发更新时的版本控制，在初始化时可以直接清空
config.version = 0;
Ok(VersionedConfig::new(config))
})
.await
}
#[cfg(test)]
/// 仅在测试环境使用，该方法会尝试从测试数据库中加载配置并写入到全局的 VERSIONED_CONFIG
pub async fn init_for_test(connection: &DatabaseConnection) -> Result<()> {
let Some(Ok(config)) = Config::load_from_database(&connection).await? else {
bail!("no config found in test database");
};
let versioned_config = VersionedConfig::new(config);
pub async fn init_for_test(connection: &DatabaseConnection) -> Result<&'static VersionedConfig> {
VERSIONED_CONFIG
.set(versioned_config)
.map_err(|e| anyhow!("VERSIONED_CONFIG has already been initialized: {}", e))?;
Ok(())
.get_or_try_init(|| async move {
let Some(Ok(config)) = Config::load_from_database(&connection).await? else {
bail!("no config found in test database");
};
Ok(VersionedConfig::new(config))
})
.await
}
#[cfg(not(test))]

15
crates/bili_sync/src/main.rs
View File

@@ -45,14 +45,13 @@ async fn main() {
&tracker,
token.clone(),
);
if !cfg!(debug_assertions) {
spawn_task(
"定时下载",
video_downloader(connection.clone(), bili_client),
&tracker,
token.clone(),
);
}
spawn_task(
"定时下载",
video_downloader(connection.clone(), bili_client),
&tracker,
token.clone(),
);
tracker.close();
handle_shutdown(connection, tracker, token).await

2
crates/bili_sync/src/task/mod.rs
View File

@@ -2,4 +2,4 @@ mod http_server;
mod video_downloader;
pub use http_server::http_server;
pub use video_downloader::video_downloader;
pub use video_downloader::{DownloadTaskManager, TaskStatus, video_downloader};

299
crates/bili_sync/src/task/video_downloader.rs
View File

@@ -1,45 +1,283 @@
use std::future;
use std::pin::Pin;
use std::sync::Arc;
use std::time::Duration;
use anyhow::{Context, Result, bail};
use chrono::NaiveDate;
use sea_orm::DatabaseConnection;
use tokio::time;
use serde::Serialize;
use tokio::sync::{OnceCell, watch};
use tokio_cron_scheduler::{Job, JobScheduler};
use crate::adapter::VideoSource;
use crate::bilibili::{self, BiliClient, BiliError};
use crate::config::{Config, TEMPLATE, VersionedConfig};
use crate::config::{Config, TEMPLATE, Trigger, VersionedConfig};
use crate::notifier::NotifierAllExt;
use crate::utils::model::get_enabled_video_sources;
use crate::utils::task_notifier::TASK_STATUS_NOTIFIER;
use crate::workflow::process_video_source;
/// 启动周期下载视频的任务
pub async fn video_downloader(connection: DatabaseConnection, bili_client: Arc<BiliClient>) {
let mut anchor = chrono::Local::now().date_naive();
loop {
let _lock = TASK_STATUS_NOTIFIER.start_running().await;
let mut config = VersionedConfig::get().snapshot();
info!("开始执行本轮视频下载任务..");
if let Err(e) = download_all_video_sources(&connection, &bili_client, &mut config, &mut anchor).await {
let error_msg = format!("本轮视频下载任务执行遇到错误：{:#}", e);
error!("{error_msg}");
let _ = config
.notifiers
.notify_all(bili_client.inner_client(), &error_msg)
.await;
} else {
info!("本轮视频下载任务执行完毕");
}
TASK_STATUS_NOTIFIER.finish_running(_lock, config.interval as i64);
time::sleep(time::Duration::from_secs(config.interval)).await;
static INSTANCE: OnceCell<DownloadTaskManager> = OnceCell::const_new();
pub struct DownloadTaskManager {
sched: Arc<JobScheduler>,
task_context: TaskContext,
}
#[derive(Serialize, Default, Clone, Copy, Debug)]
pub struct TaskStatus {
is_running: bool,
last_run: Option<chrono::DateTime<chrono::Local>>,
last_finish: Option<chrono::DateTime<chrono::Local>>,
next_run: Option<chrono::DateTime<chrono::Local>>,
}
#[derive(Clone)]
struct TaskContext {
connection: DatabaseConnection,
bili_client: Arc<BiliClient>,
running: Arc<tokio::sync::Mutex<()>>,
status_tx: watch::Sender<TaskStatus>,
status_rx: watch::Receiver<TaskStatus>,
updating: Arc<tokio::sync::Mutex<Option<uuid::Uuid>>>,
}
impl DownloadTaskManager {
pub async fn init(
connection: DatabaseConnection,
bili_client: Arc<BiliClient>,
) -> Result<&'static DownloadTaskManager> {
INSTANCE
.get_or_try_init(|| DownloadTaskManager::new(connection, bili_client))
.await
}
pub fn get() -> &'static DownloadTaskManager {
INSTANCE.get().expect("DownloadTaskManager is not initialized")
}
pub fn subscribe(&self) -> watch::Receiver<TaskStatus> {
self.task_context.status_rx.clone()
}
pub async fn oneshot(&self) -> Result<()> {
let task_context = self.task_context.clone();
let _ = self
.sched
.add(Job::new_one_shot_async(Duration::from_secs(0), move |uuid, l| {
DownloadTaskManager::download_video_task(uuid, l, task_context.clone())
})?)
.await?;
Ok(())
}
pub(self) async fn start(&self) -> Result<()> {
self.sched.start().await?;
Ok(())
}
async fn new(connection: DatabaseConnection, bili_client: Arc<BiliClient>) -> Result<Self> {
let sched = Arc::new(JobScheduler::new().await?);
let (status_tx, status_rx) = watch::channel(TaskStatus::default());
let (running, updating) = (
Arc::new(tokio::sync::Mutex::new(())),
Arc::new(tokio::sync::Mutex::new(None)),
);
// 固定每天凌晨 1 点更新凭据
let (connection_clone, bili_client_clone, running_clone) =
(connection.clone(), bili_client.clone(), running.clone());
sched
.add(Job::new_async_tz(
"0 0 1 * * *",
chrono::Local,
move |_uuid, mut _l| {
DownloadTaskManager::check_and_refresh_credential_task(
connection_clone.clone(),
bili_client_clone.clone(),
running_clone.clone(),
)
},
)?)
.await?;
let task_context = TaskContext {
connection: connection.clone(),
bili_client: bili_client.clone(),
running: running.clone(),
status_tx: status_tx.clone(),
status_rx: status_rx.clone(),
updating: updating.clone(),
};
// 根据 interval 策略分发不同触发机制的视频下载任务，并记录任务 ID
let mut rx = VersionedConfig::get().subscribe();
let initial_config = rx.borrow_and_update().clone();
let task_context_clone = task_context.clone();
let job_run = move |uuid, l| DownloadTaskManager::download_video_task(uuid, l, task_context_clone.clone());
let job = match &initial_config.interval {
Trigger::Interval(interval) => Job::new_repeated_async(Duration::from_secs(*interval), job_run)?,
Trigger::Cron(cron) => Job::new_async_tz(cron, chrono::Local, job_run)?,
};
let download_task_id = sched.add(job).await?;
*updating.lock().await = Some(download_task_id);
// 发起一个一次性的任务，更新一下下次运行的时间
let task_context_clone = task_context.clone();
sched
.add(Job::new_one_shot_async(Duration::from_secs(0), move |_uuid, mut l| {
let task_context = task_context_clone.clone();
Box::pin(async move {
let old_status = *task_context.status_rx.borrow();
let next_run = l
.next_tick_for_job(download_task_id)
.await
.ok()
.flatten()
.map(|dt| dt.with_timezone(&chrono::Local));
let _ = task_context.status_tx.send(TaskStatus { next_run, ..old_status });
})
})?)
.await?;
// 监听配置变更，动态更新视频下载任务
let task_context_clone = task_context.clone();
let sched_clone = sched.clone();
tokio::spawn(async move {
while rx.changed().await.is_ok() {
let new_config = rx.borrow().clone();
let task_context = task_context_clone.clone();
// 先把旧的视频下载任务删掉
let mut task_id_guard = task_context_clone.updating.lock().await;
if let Some(old_task_id) = *task_id_guard {
sched_clone.remove(&old_task_id).await?;
}
// 再使用新的配置创建新的视频下载任务，并添加
let job_run = move |uuid, l| DownloadTaskManager::download_video_task(uuid, l, task_context.clone());
let job = match &new_config.interval {
Trigger::Interval(interval) => Job::new_repeated_async(Duration::from_secs(*interval), job_run)?,
Trigger::Cron(cron) => Job::new_async_tz(cron, chrono::Local, job_run)?,
};
let new_task_id = sched_clone.add(job).await?;
*task_id_guard = Some(new_task_id);
// 发起一个一次性的任务，更新一下下次运行的时间
let task_context = task_context_clone.clone();
sched_clone
.add(Job::new_one_shot_async(Duration::from_secs(0), move |_uuid, mut l| {
let task_context_clone = task_context.clone();
Box::pin(async move {
let old_status = *task_context_clone.status_rx.borrow();
let next_run = l
.next_tick_for_job(new_task_id)
.await
.ok()
.flatten()
.map(|dt| dt.with_timezone(&chrono::Local));
let _ = task_context_clone.status_tx.send(TaskStatus { next_run, ..old_status });
})
})?)
.await?;
}
Result::<(), anyhow::Error>::Ok(())
});
Ok(Self { sched, task_context })
}
fn check_and_refresh_credential_task(
connection: DatabaseConnection,
bili_client: Arc<BiliClient>,
running: Arc<tokio::sync::Mutex<()>>,
) -> Pin<Box<dyn Future<Output = ()> + Send>> {
Box::pin(async move {
let _lock = running.lock().await;
let config = VersionedConfig::get().read();
info!("开始执行本轮凭据检查与刷新任务..");
match check_and_refresh_credential(connection, &bili_client, &config).await {
Ok(_) => info!("本轮凭据检查与刷新任务执行完毕"),
Err(e) => {
let error_msg = format!("本轮凭据检查与刷新任务执行遇到错误：{:#}", e);
error!("{error_msg}");
let _ = config
.notifiers
.notify_all(bili_client.inner_client(), &error_msg)
.await;
}
}
})
}
fn download_video_task(
current_task_uuid: uuid::Uuid,
mut l: JobScheduler,
cx: TaskContext,
) -> Pin<Box<dyn Future<Output = ()> + Send>> {
Box::pin(async move {
let Ok(_lock) = cx.running.try_lock() else {
warn!("上一次视频下载任务尚未结束，跳过本次执行..");
return;
};
let _ = cx.status_tx.send(TaskStatus {
is_running: true,
last_run: Some(chrono::Local::now()),
last_finish: None,
next_run: None,
});
info!("开始执行本轮视频下载任务..");
let mut config = VersionedConfig::get().snapshot();
match download_all_video_sources(&cx.connection, &cx.bili_client, &mut config).await {
Ok(_) => info!("本轮视频下载任务执行完毕"),
Err(e) => {
let error_msg = format!("本轮视频下载任务执行遇到错误：{:#}", e);
error!("{error_msg}");
let _ = config
.notifiers
.notify_all(cx.bili_client.inner_client(), &error_msg)
.await;
}
}
// 注意此处尽量从 updating 中读取 uuid，因为当前任务可能是不存在 next_tick 的 oneshot 任务
let task_uuid = (*cx.updating.lock().await).unwrap_or(current_task_uuid);
let next_run = l
.next_tick_for_job(task_uuid)
.await
.ok()
.flatten()
.map(|dt| dt.with_timezone(&chrono::Local));
let last_status = *cx.status_rx.borrow();
let _ = cx.status_tx.send(TaskStatus {
is_running: false,
last_run: last_status.last_run,
last_finish: Some(chrono::Local::now()),
next_run,
});
})
}
}
/// 启动周期下载视频的任务
pub async fn video_downloader(connection: DatabaseConnection, bili_client: Arc<BiliClient>) -> Result<()> {
let task_manager = DownloadTaskManager::init(connection, bili_client).await?;
let _ = task_manager.start().await;
future::pending::<()>().await;
Ok(())
}
async fn check_and_refresh_credential(
connection: DatabaseConnection,
bili_client: &BiliClient,
config: &Config,
) -> Result<()> {
if let Some(new_credential) = bili_client
.check_refresh(&config.credential)
.await
.context("检查刷新 Credential 失败")?
{
VersionedConfig::get()
.update_credential(new_credential, &connection)
.await
.context("更新 Credential 失败")?;
}
Ok(())
}
async fn download_all_video_sources(
connection: &DatabaseConnection,
bili_client: &BiliClient,
config: &mut Arc<Config>,
anchor: &mut NaiveDate,
) -> Result<()> {
config.check().context("配置检查失败")?;
let mixin_key = bili_client
@@ -49,19 +287,6 @@ async fn download_all_video_sources(
.into_mixin_key()
.context("解析 mixin key 失败")?;
bilibili::set_global_mixin_key(mixin_key);
if *anchor != chrono::Local::now().date_naive() {
if let Some(new_credential) = bili_client
.check_refresh(&config.credential)
.await
.context("检查刷新 Credential 失败")?
{
*config = VersionedConfig::get()
.update_credential(new_credential, connection)
.await
.context("更新 Credential 失败")?;
}
*anchor = chrono::Local::now().date_naive();
}
let template = TEMPLATE.snapshot();
let bili_client = bili_client.snapshot()?;
let video_sources = get_enabled_video_sources(connection)

1
crates/bili_sync/src/utils/mod.rs
View File

@@ -7,7 +7,6 @@ pub mod nfo;
pub mod rule;
pub mod signal;
pub mod status;
pub mod task_notifier;
pub mod validation;
use tracing_subscriber::fmt;
use tracing_subscriber::layer::SubscriberExt;

59
crates/bili_sync/src/utils/task_notifier.rs
View File

@@ -1,59 +0,0 @@
use std::sync::LazyLock;
use serde::Serialize;
use tokio::sync::{MutexGuard, watch};
pub static TASK_STATUS_NOTIFIER: LazyLock<TaskStatusNotifier> = LazyLock::new(TaskStatusNotifier::new);
#[derive(Serialize, Default, Clone, Copy)]
pub struct TaskStatus {
is_running: bool,
last_run: Option<chrono::DateTime<chrono::Local>>,
last_finish: Option<chrono::DateTime<chrono::Local>>,
next_run: Option<chrono::DateTime<chrono::Local>>,
}
pub struct TaskStatusNotifier {
mutex: tokio::sync::Mutex<()>,
tx: watch::Sender<TaskStatus>,
rx: watch::Receiver<TaskStatus>,
}
impl TaskStatusNotifier {
pub fn new() -> Self {
let (tx, rx) = watch::channel(TaskStatus::default());
Self {
mutex: tokio::sync::Mutex::const_new(()),
tx,
rx,
}
}
pub async fn start_running(&'_ self) -> MutexGuard<'_, ()> {
let lock = self.mutex.lock().await;
let _ = self.tx.send(TaskStatus {
is_running: true,
last_run: Some(chrono::Local::now()),
last_finish: None,
next_run: None,
});
lock
}
pub fn finish_running(&self, _lock: MutexGuard<()>, interval: i64) {
let last_status = self.tx.borrow();
let last_run = last_status.last_run;
drop(last_status);
let now = chrono::Local::now();
let _ = self.tx.send(TaskStatus {
is_running: false,
last_run,
last_finish: Some(now),
next_run: now.checked_add_signed(chrono::Duration::seconds(interval)),
});
}
pub fn subscribe(&self) -> tokio::sync::watch::Receiver<TaskStatus> {
self.rx.clone()
}
}

6
web/src/lib/api.ts
View File

@@ -240,6 +240,11 @@ class ApiClient {
async getDashboard(): Promise<ApiResponse<DashBoardResponse>> {
return this.get<DashBoardResponse>('/dashboard');
}
async triggerDownloadTask(): Promise<ApiResponse<boolean>> {
return this.post<boolean>('/task/download');
}
subscribeToLogs(onMessage: (data: string) => void) {
return wsManager.subscribeToLogs(onMessage);
}
@@ -281,6 +286,7 @@ const api = {
getConfig: () => apiClient.getConfig(),
updateConfig: (config: Config) => apiClient.updateConfig(config),
getDashboard: () => apiClient.getDashboard(),
triggerDownloadTask: () => apiClient.triggerDownloadTask(),
subscribeToSysInfo: (onMessage: (data: SysInfo) => void) =>
apiClient.subscribeToSysInfo(onMessage),

4
web/src/lib/types.ts
View File

@@ -286,6 +286,8 @@ export interface WebhookNotifier {
export type Notifier = TelegramNotifier | WebhookNotifier;
export type Trigger = number | string;
export interface Config {
auth_token: string;
bind_address: string;
@@ -299,7 +301,7 @@ export interface Config {
favorite_default_path: string;
collection_default_path: string;
submission_default_path: string;
interval: number;
interval: Trigger;
upper_path: string;
nfo_time_type: string;
concurrent_limit: ConcurrentLimit;

41
web/src/routes/+page.svelte
View File

@@ -3,6 +3,7 @@
import { Card, CardContent, CardHeader, CardTitle } from '$lib/components/ui/card/index.js';
import { Progress } from '$lib/components/ui/progress/index.js';
import { Badge } from '$lib/components/ui/badge/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import * as Chart from '$lib/components/ui/chart/index.js';
import MyChartTooltip from '$lib/components/custom/my-chart-tooltip.svelte';
import { curveNatural } from 'd3-shape';
@@ -24,11 +25,13 @@
import PlayIcon from '@lucide/svelte/icons/play';
import CheckCircleIcon from '@lucide/svelte/icons/check-circle';
import CalendarIcon from '@lucide/svelte/icons/calendar';
import DownloadIcon from '@lucide/svelte/icons/download';
let dashboardData: DashBoardResponse | null = null;
let sysInfo: SysInfo | null = null;
let taskStatus: TaskStatus | null = null;
let loading = false;
let triggering = false;
let unsubscribeSysInfo: (() => void) | null = null;
let unsubscribeTasks: (() => void) | null = null;
@@ -59,6 +62,23 @@
}
}
async function handleTriggerDownload() {
triggering = true;
try {
await api.triggerDownloadTask();
toast.success('已触发下载任务', {
description: '任务将立即开始执行'
});
} catch (error) {
console.error('触发下载任务失败：', error);
toast.error('触发下载任务失败', {
description: (error as ApiError).message
});
} finally {
triggering = false;
}
}
onMount(() => {
setBreadcrumb([{ label: '仪表盘' }]);
@@ -295,6 +315,8 @@
<span class="text-muted-foreground text-sm">
{taskStatus.last_run
? new Date(taskStatus.last_run).toLocaleString('en-US', {
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
@@ -311,6 +333,8 @@
<span class="text-muted-foreground text-sm">
{taskStatus.last_finish
? new Date(taskStatus.last_finish).toLocaleString('en-US', {
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
@@ -327,6 +351,8 @@
<span class="text-muted-foreground text-sm">
{taskStatus.next_run
? new Date(taskStatus.next_run).toLocaleString('en-US', {
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
@@ -336,6 +362,21 @@
</span>
</div>
</div>
<div class="mt-6 border-t pt-4">
<Button
class="w-full"
size="sm"
onclick={handleTriggerDownload}
disabled={triggering || (taskStatus?.is_running ?? false)}
>
<DownloadIcon class="h-4 w-4" />
{triggering
? '触发中...'
: taskStatus?.is_running
? '任务运行中'
: '立即执行下载任务'}
</Button>
</div>
</div>
{:else}
<div class="text-muted-foreground text-sm">加载中...</div>

55
web/src/routes/settings/+page.svelte
View File

@@ -8,8 +8,10 @@
import { Separator } from '$lib/components/ui/separator/index.js';
import { Badge } from '$lib/components/ui/badge/index.js';
import * as Dialog from '$lib/components/ui/dialog/index.js';
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
import PasswordInput from '$lib/components/custom/password-input.svelte';
import NotifierDialog from './NotifierDialog.svelte';
import InfoIcon from '@lucide/svelte/icons/info';
import api from '$lib/api';
import { toast } from 'svelte-sonner';
import { setBreadcrumb } from '$lib/stores/breadcrumb';
@@ -21,6 +23,8 @@
let saving = false;
let loading = false;
let intervalInput: string = '1200';
// Notifier 管理相关
let showNotifierDialog = false;
let editingNotifier: Notifier | null = null;
@@ -76,6 +80,13 @@
const response = await api.getConfig();
config = response.data;
formData = { ...config };
// 根据 interval 的类型初始化输入框
if (typeof formData.interval === 'number') {
intervalInput = String(formData.interval);
} else {
intervalInput = formData.interval;
}
} catch (error) {
console.error('加载配置失败:', error);
toast.error('加载配置失败', {
@@ -108,11 +119,32 @@
toast.error('配置未加载');
return;
}
// 保存前根据输入内容判断类型
const trimmed = intervalInput.trim();
const asNumber = Number(trimmed);
if (!isNaN(asNumber) && trimmed !== '') {
// 纯数字，作为 Interval
formData.interval = asNumber;
} else {
// 非数字，作为 Cron 表达式
formData.interval = trimmed;
}
saving = true;
try {
let resp = await api.updateConfig(formData);
formData = resp.data;
config = { ...formData };
// 更新输入框显示
if (typeof formData.interval === 'number') {
intervalInput = String(formData.interval);
} else {
intervalInput = formData.interval;
}
toast.success('配置已保存');
} catch (error) {
console.error('保存配置失败:', error);
@@ -214,8 +246,27 @@
/>
</div>
<div class="space-y-2">
<Label for="interval">同步间隔（秒）</Label>
<Input id="interval" type="number" min="60" bind:value={formData.interval} />
<div class="flex items-center gap-1">
<Label for="interval">任务触发条件</Label>
<Tooltip.Root>
<Tooltip.Trigger>
<InfoIcon class="text-muted-foreground h-3.5 w-3.5" />
</Tooltip.Trigger>
<Tooltip.Content>
<p class="text-xs">
视频下载任务的触发条件，支持两种格式：<br />
1. 输入数字表示间隔秒数，例如 1200 表示每隔 20 分钟触发一次； <br />
2. 输入 Cron 表达式，格式为“秒 分 时 日 月 周”，例如“0 0 2 * * *”表示每天凌晨2点触发一次。
</p>
</Tooltip.Content>
</Tooltip.Root>
</div>
<Input
id="interval"
type="text"
bind:value={intervalInput}
placeholder="1200 或 0 0 2 * * *"
/>
</div>
<div class="space-y-2">
<Label for="video-name">视频名称模板</Label>

0
web/static/.gitkeep Normal file
View File