From ed54ca13b8542eb32fc0c37252680f85f15299b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?= =?UTF-8?q?=CA=80?= Date: Fri, 10 Oct 2025 18:52:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=8A=A8=E6=80=81=20api=20=E8=8E=B7=E5=8F=96=E6=8A=95=E7=A8=BF?= =?UTF-8?q?=EF=BC=8C=E8=AF=A5=20api=20=E4=BC=9A=E8=BF=94=E5=9B=9E=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E8=A7=86=E9=A2=91=20(#485)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- crates/bili_sync/src/adapter/collection.rs | 9 +- crates/bili_sync/src/adapter/mod.rs | 8 +- crates/bili_sync/src/adapter/submission.rs | 46 +++++++++- crates/bili_sync/src/api/request.rs | 2 + crates/bili_sync/src/api/response.rs | 2 + .../src/api/routes/video_sources/mod.rs | 7 +- crates/bili_sync/src/bilibili/dynamic.rs | 88 +++++++++++++++++++ crates/bili_sync/src/bilibili/mod.rs | 29 +++++- crates/bili_sync/src/bilibili/submission.rs | 8 +- .../bili_sync/src/config/versioned_config.rs | 25 ++++-- crates/bili_sync/src/database.rs | 34 ++++--- crates/bili_sync/src/main.rs | 6 +- crates/bili_sync/src/utils/convert.rs | 23 ++++- crates/bili_sync/src/workflow.rs | 7 +- .../src/entities/submission.rs | 1 + crates/bili_sync_migration/src/lib.rs | 2 + .../m20251009_123713_add_use_dynamic_api.rs | 36 ++++++++ web/src/lib/types.ts | 8 +- web/src/routes/video-sources/+page.svelte | 52 +++++++++-- 20 files changed, 348 insertions(+), 47 deletions(-) create mode 100644 crates/bili_sync/src/bilibili/dynamic.rs create mode 100644 crates/bili_sync_migration/src/m20251009_123713_add_use_dynamic_api.rs diff --git a/.gitignore b/.gitignore index 25a6203..92ccb11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ **/target auth_data -*.sqlite +*.sqlite* debug* node_modules docs/.vitepress/cache diff --git a/crates/bili_sync/src/adapter/collection.rs b/crates/bili_sync/src/adapter/collection.rs index 09f21cf..96526f0 100644 --- a/crates/bili_sync/src/adapter/collection.rs +++ b/crates/bili_sync/src/adapter/collection.rs @@ -44,7 +44,12 @@ impl VideoSource for collection::Model { }) } - fn should_take(&self, _release_datetime: &chrono::DateTime, _latest_row_at: &chrono::DateTime) -> bool { + fn should_take( + &self, + _idx: usize, + _release_datetime: &chrono::DateTime, + _latest_row_at: &chrono::DateTime, + ) -> bool { // collection（视频合集/视频列表）返回的内容似乎并非严格按照时间排序，并且不同 collection 的排序方式也不同 // 为了保证程序正确性，collection 不根据时间提前 break，而是每次都全量拉取 true @@ -52,6 +57,7 @@ impl VideoSource for collection::Model { fn should_filter( &self, + _idx: usize, video_info: Result, latest_row_at: &chrono::DateTime, ) -> Option { @@ -61,7 +67,6 @@ impl VideoSource for collection::Model { { return Some(video_info); } - None } diff --git a/crates/bili_sync/src/adapter/mod.rs b/crates/bili_sync/src/adapter/mod.rs index 4ddd0cd..ab37dbd 100644 --- a/crates/bili_sync/src/adapter/mod.rs +++ b/crates/bili_sync/src/adapter/mod.rs @@ -56,12 +56,18 @@ pub trait VideoSource { fn update_latest_row_at(&self, datetime: DateTime) -> _ActiveModel; // 判断是否应该继续拉取视频 - fn should_take(&self, release_datetime: &chrono::DateTime, latest_row_at: &chrono::DateTime) -> bool { + fn should_take( + &self, + _idx: usize, + release_datetime: &chrono::DateTime, + latest_row_at: &chrono::DateTime, + ) -> bool { release_datetime > latest_row_at } fn should_filter( &self, + _idx: usize, video_info: Result, _latest_row_at: &chrono::DateTime, ) -> Option { diff --git a/crates/bili_sync/src/adapter/submission.rs b/crates/bili_sync/src/adapter/submission.rs index 2bf12b7..7f82a43 100644 --- a/crates/bili_sync/src/adapter/submission.rs +++ b/crates/bili_sync/src/adapter/submission.rs @@ -11,7 +11,7 @@ use sea_orm::sea_query::SimpleExpr; use sea_orm::{DatabaseConnection, Unchanged}; use crate::adapter::{_ActiveModel, VideoSource, VideoSourceEnum}; -use crate::bilibili::{BiliClient, Submission, VideoInfo}; +use crate::bilibili::{BiliClient, Dynamic, Submission, VideoInfo}; impl VideoSource for submission::Model { fn display_name(&self) -> std::borrow::Cow<'static, str> { @@ -42,6 +42,42 @@ impl VideoSource for submission::Model { }) } + fn should_take( + &self, + idx: usize, + release_datetime: &chrono::DateTime, + latest_row_at: &chrono::DateTime, + ) -> bool { + // 如果使用动态 API，那么可能出现用户置顶了一个很久以前的视频在动态顶部的情况 + // 这种情况应该继续拉取下去，不能因为第一条不满足条件就停止 + // 后续的非置顶内容是正常由新到旧排序的，可以继续使用常规方式处理 + if idx == 0 && self.use_dynamic_api { + return true; + } + release_datetime > latest_row_at + } + + fn should_filter( + &self, + idx: usize, + video_info: Result, + latest_row_at: &chrono::DateTime, + ) -> Option { + if idx == 0 && self.use_dynamic_api { + // 同理，动态 API 的第一条内容可能是置顶的老视频，单独做个过滤 + // 其实不过滤也不影响逻辑正确性，因为后续 insert 发生冲突仍然会忽略掉 + // 此处主要是出于性能考虑，减少不必要的数据库操作 + if let Ok(video_info) = video_info + && video_info.release_datetime() > latest_row_at + { + return Some(video_info); + } + None + } else { + video_info.ok() + } + } + fn rule(&self) -> &Option { &self.rule } @@ -69,6 +105,12 @@ impl VideoSource for submission::Model { } .update(connection) .await?; - Ok((updated_model.into(), Box::pin(submission.into_video_stream()))) + let video_stream = if self.use_dynamic_api { + // 必须显式写出 dyn，否则 rust 会自动推导到 impl 从而认为 if else 返回类型不一致 + Box::pin(Dynamic::from(submission).into_video_stream()) as Pin + Send + 'a>> + } else { + Box::pin(submission.into_video_stream()) + }; + Ok((updated_model.into(), video_stream)) } } diff --git a/crates/bili_sync/src/api/request.rs b/crates/bili_sync/src/api/request.rs index 407982f..18f129e 100644 --- a/crates/bili_sync/src/api/request.rs +++ b/crates/bili_sync/src/api/request.rs @@ -83,9 +83,11 @@ pub struct InsertSubmissionRequest { } #[derive(Deserialize, Validate)] +#[serde(rename_all = "camelCase")] pub struct UpdateVideoSourceRequest { #[validate(custom(function = "crate::utils::validation::validate_path"))] pub path: String, pub enabled: bool, pub rule: Option, + pub use_dynamic_api: Option, } diff --git a/crates/bili_sync/src/api/response.rs b/crates/bili_sync/src/api/response.rs index 38d014f..41387bb 100644 --- a/crates/bili_sync/src/api/response.rs +++ b/crates/bili_sync/src/api/response.rs @@ -179,6 +179,8 @@ pub struct VideoSourceDetail { pub rule: Option, #[serde(default)] pub rule_display: Option, + #[serde(default)] + pub use_dynamic_api: Option, pub enabled: bool, } diff --git a/crates/bili_sync/src/api/routes/video_sources/mod.rs b/crates/bili_sync/src/api/routes/video_sources/mod.rs index 0a070e2..51e24df 100644 --- a/crates/bili_sync/src/api/routes/video_sources/mod.rs +++ b/crates/bili_sync/src/api/routes/video_sources/mod.rs @@ -111,7 +111,8 @@ pub async fn get_video_sources_details( submission::Column::Id, submission::Column::Path, submission::Column::Enabled, - submission::Column::Rule + submission::Column::Rule, + submission::Column::UseDynamicApi ]) .into_model::() .all(&db), @@ -134,6 +135,7 @@ pub async fn get_video_sources_details( path: String::new(), rule: None, rule_display: None, + use_dynamic_api: None, enabled: false, }) } @@ -179,6 +181,9 @@ pub async fn update_video_source( active_model.path = Set(request.path); active_model.enabled = Set(request.enabled); active_model.rule = Set(request.rule); + if let Some(use_dynamic_api) = request.use_dynamic_api { + active_model.use_dynamic_api = Set(use_dynamic_api); + } _ActiveModel::Submission(active_model) }), "watch_later" => match watch_later::Entity::find_by_id(id).one(&db).await? { diff --git a/crates/bili_sync/src/bilibili/dynamic.rs b/crates/bili_sync/src/bilibili/dynamic.rs new file mode 100644 index 0000000..7e0aa20 --- /dev/null +++ b/crates/bili_sync/src/bilibili/dynamic.rs @@ -0,0 +1,88 @@ +use anyhow::{Context, Result, anyhow}; +use async_stream::try_stream; +use chrono::serde::ts_seconds; +use chrono::{DateTime, Utc}; +use futures::Stream; +use reqwest::Method; +use serde_json::Value; + +use crate::bilibili::credential::encoded_query; +use crate::bilibili::{BiliClient, MIXIN_KEY, Validate, VideoInfo}; + +pub struct Dynamic<'a> { + client: &'a BiliClient, + pub upper_id: String, +} + +#[derive(Debug, serde::Deserialize)] +pub struct DynamicItemPublished { + #[serde(with = "ts_seconds")] + pub_ts: DateTime, +} + +impl<'a> Dynamic<'a> { + pub fn new(client: &'a BiliClient, upper_id: String) -> Self { + Self { client, upper_id } + } + + pub async fn get_dynamics(&self, offset: Option) -> Result { + self.client + .request( + Method::GET, + "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all", + ) + .await + .query(&encoded_query( + vec![ + ("host_mid", self.upper_id.as_str()), + ("offset", offset.as_deref().unwrap_or("")), + ], + MIXIN_KEY.load().as_deref(), + )) + .send() + .await? + .error_for_status()? + .json::() + .await? + .validate() + } + + pub fn into_video_stream(self) -> impl Stream> + 'a { + try_stream! { + let mut offset = None; + loop { + let mut res = self + .get_dynamics(offset.take()) + .await + .with_context(|| "failed to get dynamics")?; + let items = res["data"]["items"].as_array_mut().context("items not exist")?; + for item in items.iter_mut() { + if item["type"].as_str().is_none_or(|t| t != "DYNAMIC_TYPE_AV") { + continue; + } + let published: DynamicItemPublished = serde_json::from_value(item["modules"]["module_author"].take()) + .with_context(|| "failed to parse published time")?; + let mut video_info: VideoInfo = + serde_json::from_value(item["modules"]["module_dynamic"]["major"]["archive"].take())?; + // 这些地方不使用 let else 是因为 try_stream! 宏不支持 + if let VideoInfo::Dynamic { ref mut pubtime, .. } = video_info { + *pubtime = published.pub_ts; + yield video_info; + } else { + Err(anyhow!("video info is not dynamic"))?; + } + } + if let (Some(has_more), Some(new_offset)) = + (res["data"]["has_more"].as_bool(), res["data"]["offset"].as_str()) + { + if !has_more { + break; + } + offset = Some(new_offset.to_string()); + } else { + Err(anyhow!("no has_more or offset found"))?; + } + } + } + } +} diff --git a/crates/bili_sync/src/bilibili/mod.rs b/crates/bili_sync/src/bilibili/mod.rs index 1609cbf..0f36bce 100644 --- a/crates/bili_sync/src/bilibili/mod.rs +++ b/crates/bili_sync/src/bilibili/mod.rs @@ -9,6 +9,7 @@ pub use client::{BiliClient, Client}; pub use collection::{Collection, CollectionItem, CollectionType}; pub use credential::Credential; pub use danmaku::DanmakuOption; +pub use dynamic::Dynamic; pub use error::BiliError; pub use favorite_list::FavoriteList; use favorite_list::Upper; @@ -23,6 +24,7 @@ mod client; mod collection; mod credential; mod danmaku; +mod dynamic; mod error; mod favorite_list; mod me; @@ -135,18 +137,32 @@ pub enum VideoInfo { #[serde(rename = "created", with = "ts_seconds")] ctime: DateTime, }, + // 从动态获取的视频信息（此处 pubtime 未在结构中，因此使用 default + 手动赋值） + Dynamic { + title: String, + bvid: String, + desc: String, + cover: String, + #[serde(default)] + pubtime: DateTime, + }, } #[cfg(test)] mod tests { + use std::path::Path; + use futures::StreamExt; use super::*; + use crate::config::VersionedConfig; + use crate::database::setup_database; use crate::utils::init_logger; #[ignore = "only for manual test"] #[tokio::test] - async fn test_video_info_type() { + async fn test_video_info_type() -> Result<()> { + VersionedConfig::init_for_test(&setup_database(Path::new("./test.sqlite")).await?).await?; init_logger("None,bili_sync=debug", None); let bili_client = BiliClient::new(); // 请求 UP 主视频必须要获取 mixin key，使用 key 计算请求参数的签名，否则直接提示权限不足返回空 @@ -200,6 +216,17 @@ mod tests { .await; assert!(videos.iter().all(|v| matches!(v, VideoInfo::Submission { .. }))); assert!(videos.iter().rev().is_sorted_by_key(|v| v.release_datetime())); + // 测试动态 + let dynamic = Dynamic::new(&bili_client, "659898".to_string()); + let videos = dynamic + .into_video_stream() + .take(20) + .filter_map(|v| futures::future::ready(v.ok())) + .collect::>() + .await; + assert!(videos.iter().all(|v| matches!(v, VideoInfo::Dynamic { .. }))); + assert!(videos.iter().skip(1).rev().is_sorted_by_key(|v| v.release_datetime())); + Ok(()) } #[ignore = "only for manual test"] diff --git a/crates/bili_sync/src/bilibili/submission.rs b/crates/bili_sync/src/bilibili/submission.rs index d3c5ff7..307469b 100644 --- a/crates/bili_sync/src/bilibili/submission.rs +++ b/crates/bili_sync/src/bilibili/submission.rs @@ -6,12 +6,18 @@ use serde_json::Value; use crate::bilibili::credential::encoded_query; use crate::bilibili::favorite_list::Upper; -use crate::bilibili::{BiliClient, MIXIN_KEY, Validate, VideoInfo}; +use crate::bilibili::{BiliClient, Dynamic, MIXIN_KEY, Validate, VideoInfo}; pub struct Submission<'a> { client: &'a BiliClient, pub upper_id: String, } +impl<'a> From> for Dynamic<'a> { + fn from(submission: Submission<'a>) -> Self { + Dynamic::new(submission.client, submission.upper_id) + } +} + impl<'a> Submission<'a> { pub fn new(client: &'a BiliClient, upper_id: String) -> Self { Self { client, upper_id } diff --git a/crates/bili_sync/src/config/versioned_config.rs b/crates/bili_sync/src/config/versioned_config.rs index 3305a60..7079b1a 100644 --- a/crates/bili_sync/src/config/versioned_config.rs +++ b/crates/bili_sync/src/config/versioned_config.rs @@ -53,11 +53,16 @@ impl VersionedConfig { } #[cfg(test)] - /// 单元测试直接使用测试专用的配置即可 - pub fn get() -> &'static VersionedConfig { - use std::sync::LazyLock; - static TEST_CONFIG: LazyLock = LazyLock::new(|| VersionedConfig::new(Config::test_default())); - return &TEST_CONFIG; + /// 仅在测试环境使用，该方法会尝试从测试数据库中加载配置并写入到全局的 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); + VERSIONED_CONFIG + .set(versioned_config) + .map_err(|e| anyhow!("VERSIONED_CONFIG has already been initialized: {}", e))?; + Ok(()) } #[cfg(not(test))] @@ -66,6 +71,16 @@ impl VersionedConfig { VERSIONED_CONFIG.get().expect("VERSIONED_CONFIG is not initialized") } + #[cfg(test)] + /// 尝试获取全局的 `VersionedConfig`，如果未初始化则退回测试环境的默认配置 + pub fn get() -> &'static VersionedConfig { + use std::sync::LazyLock; + static FALLBACK_CONFIG: LazyLock = + LazyLock::new(|| VersionedConfig::new(Config::test_default())); + // 优先从全局变量获取，未初始化则返回测试环境的默认配置 + return VERSIONED_CONFIG.get().unwrap_or_else(|| &FALLBACK_CONFIG); + } + pub fn new(config: Config) -> Self { Self { inner: ArcSwap::from_pointee(config), diff --git a/crates/bili_sync/src/database.rs b/crates/bili_sync/src/database.rs index 1704ec9..03f1295 100644 --- a/crates/bili_sync/src/database.rs +++ b/crates/bili_sync/src/database.rs @@ -1,3 +1,4 @@ +use std::path::Path; use std::time::Duration; use anyhow::{Context, Result}; @@ -6,14 +7,12 @@ use sea_orm::sqlx::sqlite::{SqliteConnectOptions, SqliteJournalMode, SqliteSynch use sea_orm::sqlx::{ConnectOptions as SqlxConnectOptions, Sqlite}; use sea_orm::{ConnectOptions, Database, DatabaseConnection, SqlxSqliteConnector}; -use crate::config::CONFIG_DIR; - -fn database_url() -> String { - format!("sqlite://{}?mode=rwc", CONFIG_DIR.join("data.sqlite").to_string_lossy()) +fn database_url(path: &Path) -> String { + format!("sqlite://{}?mode=rwc", path.to_string_lossy()) } -async fn database_connection() -> Result { - let mut option = ConnectOptions::new(database_url()); +async fn database_connection(database_url: &str) -> Result { + let mut option = ConnectOptions::new(database_url); option .max_connections(50) .min_connections(5) @@ -35,18 +34,25 @@ async fn database_connection() -> Result { )) } -async fn migrate_database() -> Result<()> { +async fn migrate_database(database_url: &str) -> Result<()> { // 注意此处使用内部构造的 DatabaseConnection，而不是通过 database_connection() 获取 // 这是因为使用多个连接的 Connection 会导致奇怪的迁移顺序问题，而使用默认的连接选项不会 - let connection = Database::connect(database_url()).await?; + let connection = Database::connect(database_url).await?; Ok(Migrator::up(&connection, None).await?) } /// 进行数据库迁移并获取数据库连接，供外部使用 -pub async fn setup_database() -> Result { - tokio::fs::create_dir_all(CONFIG_DIR.as_path()).await.context( - "Failed to create config directory. Please check if you have granted necessary permissions to your folder.", - )?; - migrate_database().await.context("Failed to migrate database")?; - database_connection().await.context("Failed to connect to database") +pub async fn setup_database(path: &Path) -> Result { + if let Some(parent) = path.parent() { + tokio::fs::create_dir_all(parent).await.context( + "Failed to create config directory. Please check if you have granted necessary permissions to your folder.", + )?; + } + let database_url = database_url(path); + migrate_database(&database_url) + .await + .context("Failed to migrate database")?; + database_connection(&database_url) + .await + .context("Failed to connect to database") } diff --git a/crates/bili_sync/src/main.rs b/crates/bili_sync/src/main.rs index 919c5ed..85339aa 100644 --- a/crates/bili_sync/src/main.rs +++ b/crates/bili_sync/src/main.rs @@ -25,7 +25,7 @@ use tokio_util::sync::CancellationToken; use tokio_util::task::TaskTracker; use crate::api::{LogHelper, MAX_HISTORY_LOGS}; -use crate::config::{ARGS, VersionedConfig}; +use crate::config::{ARGS, CONFIG_DIR, VersionedConfig}; use crate::database::setup_database; use crate::utils::init_logger; use crate::utils::signal::terminate; @@ -85,7 +85,9 @@ async fn init() -> (DatabaseConnection, LogHelper) { init_logger(&ARGS.log_level, Some(log_writer.clone())); info!("欢迎使用 Bili-Sync，当前程序版本：{}", config::version()); info!("项目地址：https://github.com/amtoaer/bili-sync"); - let connection = setup_database().await.expect("数据库初始化失败"); + let connection = setup_database(&CONFIG_DIR.join("data.sqlite")) + .await + .expect("数据库初始化失败"); info!("数据库初始化完成"); VersionedConfig::init(&connection).await.expect("配置初始化失败"); info!("配置初始化完成"); diff --git a/crates/bili_sync/src/utils/convert.rs b/crates/bili_sync/src/utils/convert.rs index ee34f7b..f4e75ff 100644 --- a/crates/bili_sync/src/utils/convert.rs +++ b/crates/bili_sync/src/utils/convert.rs @@ -97,7 +97,23 @@ impl VideoInfo { valid: Set(true), ..default }, - _ => unreachable!(), + VideoInfo::Dynamic { + title, + bvid, + desc, + cover, + pubtime, + } => bili_sync_entity::video::ActiveModel { + bvid: Set(bvid), + name: Set(title), + intro: Set(desc), + cover: Set(cover), + pubtime: Set(pubtime.naive_utc()), + category: Set(2), // 动态里的视频内容类型肯定是视频 + valid: Set(true), + ..default + }, + VideoInfo::Detail { .. } => unreachable!(), } } @@ -145,8 +161,9 @@ impl VideoInfo { VideoInfo::Collection { pubtime: time, .. } | VideoInfo::Favorite { fav_time: time, .. } | VideoInfo::WatchLater { fav_time: time, .. } - | VideoInfo::Submission { ctime: time, .. } => time, - _ => unreachable!(), + | VideoInfo::Submission { ctime: time, .. } + | VideoInfo::Dynamic { pubtime: time, .. } => time, + VideoInfo::Detail { .. } => unreachable!(), } } } diff --git a/crates/bili_sync/src/workflow.rs b/crates/bili_sync/src/workflow.rs index 3391a78..ee53b71 100644 --- a/crates/bili_sync/src/workflow.rs +++ b/crates/bili_sync/src/workflow.rs @@ -58,7 +58,8 @@ pub async fn refresh_video_source<'a>( let mut max_datetime = latest_row_at; let mut error = Ok(()); let mut video_streams = video_streams - .take_while(|res| { + .enumerate() + .take_while(|(idx, res)| { match res { Err(e) => { error = Err(anyhow!(e.to_string())); @@ -72,11 +73,11 @@ pub async fn refresh_video_source<'a>( if release_datetime > &max_datetime { max_datetime = *release_datetime; } - futures::future::ready(video_source.should_take(release_datetime, &latest_row_at)) + futures::future::ready(video_source.should_take(*idx, release_datetime, &latest_row_at)) } } }) - .filter_map(|res| futures::future::ready(video_source.should_filter(res, &latest_row_at))) + .filter_map(|(idx, res)| futures::future::ready(video_source.should_filter(idx, res, &latest_row_at))) .chunks(10); let mut count = 0; while let Some(videos_info) = video_streams.next().await { diff --git a/crates/bili_sync_entity/src/entities/submission.rs b/crates/bili_sync_entity/src/entities/submission.rs index 4aa993f..cbb846d 100644 --- a/crates/bili_sync_entity/src/entities/submission.rs +++ b/crates/bili_sync_entity/src/entities/submission.rs @@ -13,6 +13,7 @@ pub struct Model { pub upper_name: String, pub path: String, pub created_at: String, + pub use_dynamic_api: bool, pub latest_row_at: DateTime, pub rule: Option, pub enabled: bool, diff --git a/crates/bili_sync_migration/src/lib.rs b/crates/bili_sync_migration/src/lib.rs index 464860e..d3e34a5 100644 --- a/crates/bili_sync_migration/src/lib.rs +++ b/crates/bili_sync_migration/src/lib.rs @@ -9,6 +9,7 @@ mod m20250612_090826_add_enabled; mod m20250613_043257_add_config; mod m20250712_080013_add_video_created_at_index; mod m20250903_094454_add_rule_and_should_download; +mod m20251009_123713_add_use_dynamic_api; pub struct Migrator; @@ -25,6 +26,7 @@ impl MigratorTrait for Migrator { Box::new(m20250613_043257_add_config::Migration), Box::new(m20250712_080013_add_video_created_at_index::Migration), Box::new(m20250903_094454_add_rule_and_should_download::Migration), + Box::new(m20251009_123713_add_use_dynamic_api::Migration), ] } } diff --git a/crates/bili_sync_migration/src/m20251009_123713_add_use_dynamic_api.rs b/crates/bili_sync_migration/src/m20251009_123713_add_use_dynamic_api.rs new file mode 100644 index 0000000..e481d39 --- /dev/null +++ b/crates/bili_sync_migration/src/m20251009_123713_add_use_dynamic_api.rs @@ -0,0 +1,36 @@ +use sea_orm_migration::prelude::*; +use sea_orm_migration::schema::*; + +#[derive(DeriveMigrationName)] +pub struct Migration; + +#[async_trait::async_trait] +impl MigrationTrait for Migration { + async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .alter_table( + Table::alter() + .table(Submission::Table) + .add_column(boolean(Submission::UseDynamicApi).default(false)) + .to_owned(), + ) + .await + } + + async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .alter_table( + Table::alter() + .table(Submission::Table) + .drop_column(Submission::UseDynamicApi) + .to_owned(), + ) + .await + } +} + +#[derive(DeriveIden)] +enum Submission { + Table, + UseDynamicApi, +} diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts index e093d52..2513ecd 100644 --- a/web/src/lib/types.ts +++ b/web/src/lib/types.ts @@ -188,8 +188,9 @@ export interface VideoSourceDetail { id: number; name: string; path: string; - rule?: Rule | null; - ruleDisplay?: string | null; + rule: Rule | null; + ruleDisplay: string | null; + useDynamicApi: boolean | null; enabled: boolean; } @@ -206,6 +207,7 @@ export interface UpdateVideoSourceRequest { path: string; enabled: boolean; rule?: Rule | null; + useDynamicApi?: boolean | null; } // 配置相关类型 @@ -315,5 +317,5 @@ export interface TaskStatus { } export interface UpdateVideoSourceResponse { - ruleDisplay?: string; + ruleDisplay: string; } diff --git a/web/src/routes/video-sources/+page.svelte b/web/src/routes/video-sources/+page.svelte index 638b3e3..9d39245 100644 --- a/web/src/routes/video-sources/+page.svelte +++ b/web/src/routes/video-sources/+page.svelte @@ -13,6 +13,7 @@ import UserIcon from '@lucide/svelte/icons/user'; import ClockIcon from '@lucide/svelte/icons/clock'; import PlusIcon from '@lucide/svelte/icons/plus'; + import InfoIcon from '@lucide/svelte/icons/info'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { toast } from 'svelte-sonner'; import { setBreadcrumb } from '$lib/stores/breadcrumb'; @@ -48,7 +49,8 @@ let editForm = { path: '', enabled: false, - rule: null as Rule | null + rule: null as Rule | null, + useDynamicApi: null as boolean | null }; // 表单数据 @@ -86,7 +88,8 @@ editForm = { path: source.path, enabled: source.enabled, - rule: source.rule || null + useDynamicApi: source.useDynamicApi, + rule: source.rule }; showEditDialog = true; } @@ -110,7 +113,8 @@ let response = await api.updateVideoSource(editingType, editingSource.id, { path: editForm.path, enabled: editForm.enabled, - rule: editForm.rule + rule: editForm.rule, + useDynamicApi: editForm.useDynamicApi }); // 更新本地数据 if (videoSourcesData && editingSource) { @@ -122,6 +126,7 @@ path: editForm.path, enabled: editForm.enabled, rule: editForm.rule, + useDynamicApi: editForm.useDynamicApi, ruleDisplay: response.data.ruleDisplay }; videoSourcesData = { ...videoSourcesData }; @@ -266,9 +271,12 @@ 名称 - 下载路径 + 下载路径 过滤规则 - 状态 + 启用状态 + {#if key === 'submissions'} + 使用动态 API + {/if} 操作 @@ -304,11 +312,17 @@
- - {source.enabled ? '已启用' : '已禁用'} -
+ {#if key === 'submissions'} + +
+ {#if source.useDynamicApi !== null} + + {/if} +
+ + {/if}