chore: 发布 bili-sync 2.6.3

Cargo.lock

@@ -475,7 +475,7 @@ dependencies = [
 
 [[package]]
 name = "bili_sync"
-version = "2.6.2"
+version = "2.6.3"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -530,7 +530,7 @@ dependencies = [
 
 [[package]]
 name = "bili_sync_entity"
-version = "2.6.2"
+version = "2.6.3"
 dependencies = [
  "sea-orm",
  "serde_json",
@@ -538,7 +538,7 @@ dependencies = [
 
 [[package]]
 name = "bili_sync_migration"
-version = "2.6.2"
+version = "2.6.3"
 dependencies = [
  "async-std",
  "sea-orm-migration",

Cargo.toml

@@ -4,7 +4,7 @@ default-members = ["crates/bili_sync"]
 resolver = "2"
 
 [workspace.package]
-version = "2.6.2"
+version = "2.6.3"
 authors = ["amtoaer <amtoaer@gmail.com>"]
 license = "MIT"
 description = "由 Rust & Tokio 驱动的哔哩哔哩同步工具"

crates/bili_sync/src/api/routes/config/mod.rs

@@ -22,7 +22,7 @@ pub async fn get_config() -> Result<ApiResponse<Arc<Config>>, ApiError> {
 
 /// 更新全局配置
 pub async fn update_config(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     ValidatedJson(config): ValidatedJson<Config>,
 ) -> Result<ApiResponse<Arc<Config>>, ApiError> {
     let Some(_lock) = TASK_STATUS_NOTIFIER.detect_running() else {
@@ -30,7 +30,7 @@ pub async fn update_config(
         return Err(InnerApiError::BadRequest("下载任务正在运行，无法修改配置".to_string()).into());
     };
     config.check()?;
-    let new_config = VersionedConfig::get().update(config, db.as_ref()).await?;
+    let new_config = VersionedConfig::get().update(config, &db).await?;
     drop(_lock);
     Ok(ApiResponse::ok(new_config))
 }

crates/bili_sync/src/api/routes/dashboard/mod.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use axum::routing::get;
 use axum::{Extension, Router};
 use bili_sync_entity::*;
@@ -14,21 +12,21 @@ pub(super) fn router() -> Router {
 }
 
 async fn get_dashboard(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
 ) -> Result<ApiResponse<DashBoardResponse>, ApiError> {
     let (enabled_favorites, enabled_collections, enabled_submissions, enabled_watch_later, videos_by_day) = tokio::try_join!(
         favorite::Entity::find()
             .filter(favorite::Column::Enabled.eq(true))
-            .count(db.as_ref()),
+            .count(&db),
         collection::Entity::find()
             .filter(collection::Column::Enabled.eq(true))
-            .count(db.as_ref()),
+            .count(&db),
         submission::Entity::find()
             .filter(submission::Column::Enabled.eq(true))
-            .count(db.as_ref()),
+            .count(&db),
         watch_later::Entity::find()
             .filter(watch_later::Column::Enabled.eq(true))
-            .count(db.as_ref()),
+            .count(&db),
         DayCountPair::find_by_statement(Statement::from_string(
             db.get_database_backend(),
             // 用 SeaORM 太复杂了，直接写个裸 SQL
@@ -55,7 +53,7 @@ ORDER BY
     dates.day;
     "
         ))
-        .all(db.as_ref()),
+        .all(&db),
     )?;
     return Ok(ApiResponse::ok(DashBoardResponse {
         enabled_favorites,

crates/bili_sync/src/api/routes/me/mod.rs

@@ -25,7 +25,7 @@ pub(super) fn router() -> Router {
 
 /// 获取当前用户创建的收藏夹
 pub async fn get_created_favorites(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Extension(bili_client): Extension<Arc<BiliClient>>,
 ) -> Result<ApiResponse<FavoritesResponse>, ApiError> {
     let me = Me::new(bili_client.as_ref());
@@ -40,7 +40,7 @@ pub async fn get_created_favorites(
             .column(favorite::Column::FId)
             .filter(favorite::Column::FId.is_in(bili_fids))
             .into_tuple()
-            .all(db.as_ref())
+            .all(&db)
             .await?;
         let subscribed_set: HashSet<i64> = subscribed_fids.into_iter().collect();
 
@@ -64,7 +64,7 @@ pub async fn get_created_favorites(
 
 /// 获取当前用户收藏的合集
 pub async fn get_followed_collections(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Extension(bili_client): Extension<Arc<BiliClient>>,
     Query(params): Query<FollowedCollectionsRequest>,
 ) -> Result<ApiResponse<CollectionsResponse>, ApiError> {
@@ -80,7 +80,7 @@ pub async fn get_followed_collections(
             .column(collection::Column::SId)
             .filter(collection::Column::SId.is_in(bili_sids))
             .into_tuple()
-            .all(db.as_ref())
+            .all(&db)
             .await?;
         let subscribed_set: HashSet<i64> = subscribed_ids.into_iter().collect();
 
@@ -106,7 +106,7 @@ pub async fn get_followed_collections(
 
 /// 获取当前用户关注的 UP 主
 pub async fn get_followed_uppers(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Extension(bili_client): Extension<Arc<BiliClient>>,
     Query(params): Query<FollowedUppersRequest>,
 ) -> Result<ApiResponse<UppersResponse>, ApiError> {
@@ -121,7 +121,7 @@ pub async fn get_followed_uppers(
         .column(submission::Column::UpperId)
         .filter(submission::Column::UpperId.is_in(bili_uid))
         .into_tuple()
-        .all(db.as_ref())
+        .all(&db)
         .await?;
     let subscribed_set: HashSet<i64> = subscribed_ids.into_iter().collect();
 

crates/bili_sync/src/api/routes/video_sources/mod.rs

@@ -30,31 +30,31 @@ pub(super) fn router() -> Router {
 
 /// 列出所有视频来源
 pub async fn get_video_sources(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
 ) -> Result<ApiResponse<VideoSourcesResponse>, ApiError> {
     let (collection, favorite, submission, mut watch_later) = tokio::try_join!(
         collection::Entity::find()
             .select_only()
             .columns([collection::Column::Id, collection::Column::Name])
             .into_model::<VideoSource>()
-            .all(db.as_ref()),
+            .all(&db),
         favorite::Entity::find()
             .select_only()
             .columns([favorite::Column::Id, favorite::Column::Name])
             .into_model::<VideoSource>()
-            .all(db.as_ref()),
+            .all(&db),
         submission::Entity::find()
             .select_only()
             .column(submission::Column::Id)
             .column_as(submission::Column::UpperName, "name")
             .into_model::<VideoSource>()
-            .all(db.as_ref()),
+            .all(&db),
         watch_later::Entity::find()
             .select_only()
             .column(watch_later::Column::Id)
             .column_as(Expr::value("稍后再看"), "name")
             .into_model::<VideoSource>()
-            .all(db.as_ref())
+            .all(&db)
     )?;
     // watch_later 是一个特殊的视频来源，如果不存在则添加一个默认项
     if watch_later.is_empty() {
@@ -73,7 +73,7 @@ pub async fn get_video_sources(
 
 /// 获取视频来源详情
 pub async fn get_video_sources_details(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
 ) -> Result<ApiResponse<VideoSourcesDetailsResponse>, ApiError> {
     let (collections, favorites, submissions, mut watch_later) = tokio::try_join!(
         collection::Entity::find()
@@ -85,7 +85,7 @@ pub async fn get_video_sources_details(
                 collection::Column::Enabled
             ])
             .into_model::<VideoSourceDetail>()
-            .all(db.as_ref()),
+            .all(&db),
         favorite::Entity::find()
             .select_only()
             .columns([
@@ -95,21 +95,21 @@ pub async fn get_video_sources_details(
                 favorite::Column::Enabled
             ])
             .into_model::<VideoSourceDetail>()
-            .all(db.as_ref()),
+            .all(&db),
         submission::Entity::find()
             .select_only()
             .column(submission::Column::Id)
             .column_as(submission::Column::UpperName, "name")
             .columns([submission::Column::Path, submission::Column::Enabled])
             .into_model::<VideoSourceDetail>()
-            .all(db.as_ref()),
+            .all(&db),
         watch_later::Entity::find()
             .select_only()
             .column(watch_later::Column::Id)
             .column_as(Expr::value("稍后再看"), "name")
             .columns([watch_later::Column::Path, watch_later::Column::Enabled])
             .into_model::<VideoSourceDetail>()
-            .all(db.as_ref())
+            .all(&db)
     )?;
     if watch_later.is_empty() {
         watch_later.push(VideoSourceDetail {
@@ -130,29 +130,29 @@ pub async fn get_video_sources_details(
 /// 更新视频来源
 pub async fn update_video_source(
     Path((source_type, id)): Path<(String, i32)>,
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     ValidatedJson(request): ValidatedJson<UpdateVideoSourceRequest>,
 ) -> Result<ApiResponse<bool>, ApiError> {
     let active_model = match source_type.as_str() {
-        "collections" => collection::Entity::find_by_id(id).one(db.as_ref()).await?.map(|model| {
+        "collections" => collection::Entity::find_by_id(id).one(&db).await?.map(|model| {
             let mut active_model: collection::ActiveModel = model.into();
             active_model.path = Set(request.path);
             active_model.enabled = Set(request.enabled);
             _ActiveModel::Collection(active_model)
         }),
-        "favorites" => favorite::Entity::find_by_id(id).one(db.as_ref()).await?.map(|model| {
+        "favorites" => favorite::Entity::find_by_id(id).one(&db).await?.map(|model| {
             let mut active_model: favorite::ActiveModel = model.into();
             active_model.path = Set(request.path);
             active_model.enabled = Set(request.enabled);
             _ActiveModel::Favorite(active_model)
         }),
-        "submissions" => submission::Entity::find_by_id(id).one(db.as_ref()).await?.map(|model| {
+        "submissions" => submission::Entity::find_by_id(id).one(&db).await?.map(|model| {
             let mut active_model: submission::ActiveModel = model.into();
             active_model.path = Set(request.path);
             active_model.enabled = Set(request.enabled);
             _ActiveModel::Submission(active_model)
         }),
-        "watch_later" => match watch_later::Entity::find_by_id(id).one(db.as_ref()).await? {
+        "watch_later" => match watch_later::Entity::find_by_id(id).one(&db).await? {
             // 稍后再看需要做特殊处理，get 时如果稍后再看不存在返回的是 id 为 1 的假记录
             // 因此此处可能是更新也可能是插入，做个额外的处理
             Some(model) => {
@@ -180,13 +180,13 @@ pub async fn update_video_source(
     let Some(active_model) = active_model else {
         return Err(InnerApiError::NotFound(id).into());
     };
-    active_model.save(db.as_ref()).await?;
+    active_model.save(&db).await?;
     Ok(ApiResponse::ok(true))
 }
 
 /// 新增收藏夹订阅
 pub async fn insert_favorite(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Extension(bili_client): Extension<Arc<BiliClient>>,
     ValidatedJson(request): ValidatedJson<InsertFavoriteRequest>,
 ) -> Result<ApiResponse<bool>, ApiError> {
@@ -199,14 +199,14 @@ pub async fn insert_favorite(
         enabled: Set(true),
         ..Default::default()
     })
-    .exec(db.as_ref())
+    .exec(&db)
     .await?;
     Ok(ApiResponse::ok(true))
 }
 
 /// 新增合集/列表订阅
 pub async fn insert_collection(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Extension(bili_client): Extension<Arc<BiliClient>>,
     ValidatedJson(request): ValidatedJson<InsertCollectionRequest>,
 ) -> Result<ApiResponse<bool>, ApiError> {
@@ -228,7 +228,7 @@ pub async fn insert_collection(
         enabled: Set(true),
         ..Default::default()
     })
-    .exec(db.as_ref())
+    .exec(&db)
     .await?;
 
     Ok(ApiResponse::ok(true))
@@ -236,7 +236,7 @@ pub async fn insert_collection(
 
 /// 新增投稿订阅
 pub async fn insert_submission(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Extension(bili_client): Extension<Arc<BiliClient>>,
     ValidatedJson(request): ValidatedJson<InsertSubmissionRequest>,
 ) -> Result<ApiResponse<bool>, ApiError> {
@@ -249,7 +249,7 @@ pub async fn insert_submission(
         enabled: Set(true),
         ..Default::default()
     })
-    .exec(db.as_ref())
+    .exec(&db)
     .await?;
     Ok(ApiResponse::ok(true))
 }

crates/bili_sync/src/api/routes/videos/mod.rs

@@ -1,5 +1,4 @@
 use std::collections::HashSet;
-use std::sync::Arc;
 
 use anyhow::Result;
 use axum::extract::{Extension, Path, Query};
@@ -31,7 +30,7 @@ pub(super) fn router() -> Router {
 
 /// 列出视频的基本信息，支持根据视频来源筛选、名称查找和分页
 pub async fn get_videos(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Query(params): Query<VideosRequest>,
 ) -> Result<ApiResponse<VideosResponse>, ApiError> {
     let mut query = video::Entity::find();
@@ -48,7 +47,7 @@ pub async fn get_videos(
     if let Some(query_word) = params.query {
         query = query.filter(video::Column::Name.contains(query_word));
     }
-    let total_count = query.clone().count(db.as_ref()).await?;
+    let total_count = query.clone().count(&db).await?;
     let (page, page_size) = if let (Some(page), Some(page_size)) = (params.page, params.page_size) {
         (page, page_size)
     } else {
@@ -58,7 +57,7 @@ pub async fn get_videos(
         videos: query
             .order_by_desc(video::Column::Id)
             .into_partial_model::<VideoInfo>()
-            .paginate(db.as_ref(), page_size)
+            .paginate(&db, page_size)
             .fetch_page(page)
             .await?,
         total_count,
@@ -67,17 +66,15 @@ pub async fn get_videos(
 
 pub async fn get_video(
     Path(id): Path<i32>,
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
 ) -> Result<ApiResponse<VideoResponse>, ApiError> {
     let (video_info, pages_info) = tokio::try_join!(
-        video::Entity::find_by_id(id)
-            .into_partial_model::<VideoInfo>()
-            .one(db.as_ref()),
+        video::Entity::find_by_id(id).into_partial_model::<VideoInfo>().one(&db),
         page::Entity::find()
             .filter(page::Column::VideoId.eq(id))
             .order_by_asc(page::Column::Cid)
             .into_partial_model::<PageInfo>()
-            .all(db.as_ref())
+            .all(&db)
     )?;
     let Some(video_info) = video_info else {
         return Err(InnerApiError::NotFound(id).into());
@@ -90,18 +87,16 @@ pub async fn get_video(
 
 pub async fn reset_video(
     Path(id): Path<i32>,
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Json(request): Json<ResetRequest>,
 ) -> Result<ApiResponse<ResetVideoResponse>, ApiError> {
     let (video_info, pages_info) = tokio::try_join!(
-        video::Entity::find_by_id(id)
-            .into_partial_model::<VideoInfo>()
-            .one(db.as_ref()),
+        video::Entity::find_by_id(id).into_partial_model::<VideoInfo>().one(&db),
         page::Entity::find()
             .filter(page::Column::VideoId.eq(id))
             .order_by_asc(page::Column::Cid)
             .into_partial_model::<PageInfo>()
-            .all(db.as_ref())
+            .all(&db)
     )?;
     let Some(mut video_info) = video_info else {
         return Err(InnerApiError::NotFound(id).into());
@@ -150,13 +145,13 @@ pub async fn reset_video(
 }
 
 pub async fn reset_all_videos(
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     Json(request): Json<ResetRequest>,
 ) -> Result<ApiResponse<ResetAllVideosResponse>, ApiError> {
     // 先查询所有视频和页面数据
     let (all_videos, all_pages) = tokio::try_join!(
-        video::Entity::find().into_partial_model::<VideoInfo>().all(db.as_ref()),
-        page::Entity::find().into_partial_model::<PageInfo>().all(db.as_ref())
+        video::Entity::find().into_partial_model::<VideoInfo>().all(&db),
+        page::Entity::find().into_partial_model::<PageInfo>().all(&db)
     )?;
     let resetted_pages_info = all_pages
         .into_iter()
@@ -210,18 +205,16 @@ pub async fn reset_all_videos(
 
 pub async fn update_video_status(
     Path(id): Path<i32>,
-    Extension(db): Extension<Arc<DatabaseConnection>>,
+    Extension(db): Extension<DatabaseConnection>,
     ValidatedJson(request): ValidatedJson<UpdateVideoStatusRequest>,
 ) -> Result<ApiResponse<UpdateVideoStatusResponse>, ApiError> {
     let (video_info, mut pages_info) = tokio::try_join!(
-        video::Entity::find_by_id(id)
-            .into_partial_model::<VideoInfo>()
-            .one(db.as_ref()),
+        video::Entity::find_by_id(id).into_partial_model::<VideoInfo>().one(&db),
         page::Entity::find()
             .filter(page::Column::VideoId.eq(id))
             .order_by_asc(page::Column::Cid)
             .into_partial_model::<PageInfo>()
-            .all(db.as_ref())
+            .all(&db)
     )?;
     let Some(mut video_info) = video_info else {
         return Err(InnerApiError::NotFound(id).into());

crates/bili_sync/src/database.rs

@@ -1,6 +1,10 @@
+use std::time::Duration;
+
 use anyhow::{Context, Result};
 use bili_sync_migration::{Migrator, MigratorTrait};
-use sea_orm::{ConnectOptions, Database, DatabaseConnection};
+use sea_orm::sqlx::sqlite::{SqliteConnectOptions, SqliteJournalMode, SqliteSynchronous};
+use sea_orm::sqlx::{ConnectOptions as SqlxConnectOptions, Sqlite};
+use sea_orm::{ConnectOptions, Database, DatabaseConnection, SqlxSqliteConnector};
 
 use crate::config::CONFIG_DIR;
 
@@ -11,10 +15,24 @@ fn database_url() -> String {
 async fn database_connection() -> Result<DatabaseConnection> {
     let mut option = ConnectOptions::new(database_url());
     option
-        .max_connections(100)
+        .max_connections(50)
         .min_connections(5)
-        .acquire_timeout(std::time::Duration::from_secs(90));
-    Ok(Database::connect(option).await?)
+        .acquire_timeout(Duration::from_secs(90));
+    let connect_option = option
+        .get_url()
+        .parse::<SqliteConnectOptions>()
+        .context("Failed to parse database URL")?
+        .disable_statement_logging()
+        .busy_timeout(Duration::from_secs(90))
+        .journal_mode(SqliteJournalMode::Wal)
+        .synchronous(SqliteSynchronous::Normal)
+        .optimize_on_close(true, None);
+    Ok(SqlxSqliteConnector::from_sqlx_sqlite_pool(
+        option
+            .sqlx_pool_options::<Sqlite>()
+            .connect_with(connect_option)
+            .await?,
+    ))
 }
 
 async fn migrate_database() -> Result<()> {
@@ -26,9 +44,9 @@ async fn migrate_database() -> Result<()> {
 
 /// 进行数据库迁移并获取数据库连接，供外部使用
 pub async fn setup_database() -> Result<DatabaseConnection> {
-    tokio::fs::create_dir_all(CONFIG_DIR.as_path())
-        .await
-        .context("Failed to create config directory")?;
+    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")
 }

crates/bili_sync/src/main.rs

@@ -47,14 +47,14 @@ async fn main() {
     if !cfg!(debug_assertions) {
         spawn_task(
             "定时下载",
-            video_downloader(connection, bili_client),
+            video_downloader(connection.clone(), bili_client),
             &tracker,
             token.clone(),
         );
     }
 
     tracker.close();
-    handle_shutdown(tracker, token).await
+    handle_shutdown(connection, tracker, token).await
 }
 
 fn spawn_task(
@@ -77,7 +77,7 @@ fn spawn_task(
 }
 
 /// 初始化日志系统、打印欢迎信息，初始化数据库连接和全局配置
-async fn init() -> (Arc<DatabaseConnection>, LogHelper) {
+async fn init() -> (DatabaseConnection, LogHelper) {
     let (tx, _rx) = tokio::sync::broadcast::channel(30);
     let log_history = Arc::new(Mutex::new(VecDeque::with_capacity(MAX_HISTORY_LOGS + 1)));
     let log_writer = LogHelper::new(tx, log_history.clone());
@@ -85,7 +85,7 @@ async fn init() -> (Arc<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 = Arc::new(setup_database().await.expect("数据库初始化失败"));
+    let connection = setup_database().await.expect("数据库初始化失败");
     info!("数据库初始化完成");
     VersionedConfig::init(&connection).await.expect("配置初始化失败");
     info!("配置初始化完成");
@@ -93,16 +93,21 @@ async fn init() -> (Arc<DatabaseConnection>, LogHelper) {
     (connection, log_writer)
 }
 
-async fn handle_shutdown(tracker: TaskTracker, token: CancellationToken) {
+async fn handle_shutdown(connection: DatabaseConnection, tracker: TaskTracker, token: CancellationToken) {
     tokio::select! {
         _ = tracker.wait() => {
-            error!("所有任务均已终止，程序退出")
+            error!("所有任务均已终止..")
         }
         _ = terminate() => {
-            info!("接收到终止信号，正在终止任务..");
+            info!("接收到终止信号，开始终止任务..");
             token.cancel();
             tracker.wait().await;
-            info!("所有任务均已终止，程序退出");
+            info!("所有任务均已终止..");
         }
     }
+    info!("正在关闭数据库连接..");
+    match connection.close().await {
+        Ok(()) => info!("数据库连接已关闭，程序结束"),
+        Err(e) => error!("关闭数据库连接时遇到错误：{:#}，程序异常结束", e),
+    }
 }

crates/bili_sync/src/task/http_server.rs

@@ -21,7 +21,7 @@ use crate::config::VersionedConfig;
 struct Asset;
 
 pub async fn http_server(
-    database_connection: Arc<DatabaseConnection>,
+    database_connection: DatabaseConnection,
     bili_client: Arc<BiliClient>,
     log_writer: LogHelper,
 ) -> Result<()> {

crates/bili_sync/src/task/video_downloader.rs

@@ -11,7 +11,7 @@ use crate::utils::task_notifier::TASK_STATUS_NOTIFIER;
 use crate::workflow::process_video_source;
 
 /// 启动周期下载视频的任务
-pub async fn video_downloader(connection: Arc<DatabaseConnection>, bili_client: Arc<BiliClient>) {
+pub async fn video_downloader(connection: DatabaseConnection, bili_client: Arc<BiliClient>) {
     let mut anchor = chrono::Local::now().date_naive();
     loop {
         info!("开始执行本轮视频下载任务..");

crates/bili_sync/src/utils/convert.rs

@@ -152,10 +152,7 @@ impl VideoInfo {
 }
 
 impl PageInfo {
-    pub fn into_active_model(
-        self,
-        video_model: &bili_sync_entity::video::Model,
-    ) -> bili_sync_entity::page::ActiveModel {
+    pub fn into_active_model(self, video_model_id: i32) -> bili_sync_entity::page::ActiveModel {
         let (width, height) = match &self.dimension {
             Some(d) => {
                 if d.rotate == 0 {
@@ -167,7 +164,7 @@ impl PageInfo {
             None => (None, None),
         };
         bili_sync_entity::page::ActiveModel {
-            video_id: Set(video_model.id),
+            video_id: Set(video_model_id),
             cid: Set(self.cid),
             pid: Set(self.page),
             name: Set(self.name),

crates/bili_sync/src/utils/model.rs

@@ -6,7 +6,7 @@ use sea_orm::sea_query::{OnConflict, SimpleExpr};
 use sea_orm::{DatabaseTransaction, TransactionTrait};
 
 use crate::adapter::{VideoSource, VideoSourceEnum};
-use crate::bilibili::{PageInfo, VideoInfo};
+use crate::bilibili::VideoInfo;
 use crate::config::{Config, LegacyConfig};
 use crate::utils::status::STATUS_COMPLETED;
 
@@ -73,16 +73,8 @@ pub async fn create_videos(
 }
 
 /// 尝试创建 Page Model，如果发生冲突则忽略
-pub async fn create_pages(
-    pages_info: Vec<PageInfo>,
-    video_model: &bili_sync_entity::video::Model,
-    connection: &DatabaseTransaction,
-) -> Result<()> {
-    let page_models = pages_info
-        .into_iter()
-        .map(|p| p.into_active_model(video_model))
-        .collect::<Vec<page::ActiveModel>>();
-    for page_chunk in page_models.chunks(50) {
+pub async fn create_pages(pages_model: Vec<page::ActiveModel>, connection: &DatabaseTransaction) -> Result<()> {
+    for page_chunk in pages_model.chunks(200) {
         page::Entity::insert_many(page_chunk.to_vec())
             .on_conflict(
                 OnConflict::columns([page::Column::VideoId, page::Column::Pid])

crates/bili_sync/src/workflow.rs

@@ -102,43 +102,48 @@ pub async fn fetch_video_details(
 ) -> Result<()> {
     video_source.log_fetch_video_start();
     let videos_model = filter_unfilled_videos(video_source.filter_expr(), connection).await?;
+    let semaphore = Semaphore::new(VersionedConfig::get().load().concurrent_limit.video);
+    let semaphore_ref = &semaphore;
     let tasks = videos_model
         .into_iter()
-        .map(|video_model| {
-            async move {
-                let video = Video::new(bili_client, video_model.bvid.clone());
-                let info: Result<_> = async { Ok((video.get_tags().await?, video.get_view_info().await?)) }.await;
-                match info {
-                    Err(e) => {
-                        error!(
-                            "获取视频 {} - {} 的详细信息失败，错误为：{:#}",
-                            &video_model.bvid, &video_model.name, e
-                        );
-                        if let Some(BiliError::RequestFailed(-404, _)) = e.downcast_ref::<BiliError>() {
-                            let mut video_active_model: bili_sync_entity::video::ActiveModel = video_model.into();
-                            video_active_model.valid = Set(false);
-                            video_active_model.save(connection).await?;
-                        }
+        .map(|video_model| async move {
+            let _permit = semaphore_ref.acquire().await.context("acquire semaphore failed")?;
+            let video = Video::new(bili_client, video_model.bvid.clone());
+            let info: Result<_> = async { Ok((video.get_tags().await?, video.get_view_info().await?)) }.await;
+            match info {
+                Err(e) => {
+                    error!(
+                        "获取视频 {} - {} 的详细信息失败，错误为：{:#}",
+                        &video_model.bvid, &video_model.name, e
+                    );
+                    if let Some(BiliError::RequestFailed(-404, _)) = e.downcast_ref::<BiliError>() {
+                        let mut video_active_model: bili_sync_entity::video::ActiveModel = video_model.into();
+                        video_active_model.valid = Set(false);
+                        video_active_model.save(connection).await?;
                     }
-                    Ok((tags, mut view_info)) => {
-                        let VideoInfo::Detail { pages, .. } = &mut view_info else {
-                            unreachable!()
-                        };
-                        let pages = std::mem::take(pages);
-                        let pages_len = pages.len();
-                        let txn = connection.begin().await?;
-                        // 将分页信息写入数据库
-                        create_pages(pages, &video_model, &txn).await?;
-                        let mut video_active_model = view_info.into_detail_model(video_model);
-                        video_source.set_relation_id(&mut video_active_model);
-                        video_active_model.single_page = Set(Some(pages_len == 1));
-                        video_active_model.tags = Set(Some(serde_json::to_value(tags)?));
-                        video_active_model.save(&txn).await?;
-                        txn.commit().await?;
-                    }
-                };
-                Ok::<_, anyhow::Error>(())
-            }
+                }
+                Ok((tags, mut view_info)) => {
+                    let VideoInfo::Detail { pages, .. } = &mut view_info else {
+                        unreachable!()
+                    };
+                    // 构造 page model
+                    let pages = std::mem::take(pages);
+                    let pages = pages
+                        .into_iter()
+                        .map(|p| p.into_active_model(video_model.id))
+                        .collect::<Vec<page::ActiveModel>>();
+                    // 更新 video model 的各项有关属性
+                    let mut video_active_model = view_info.into_detail_model(video_model);
+                    video_source.set_relation_id(&mut video_active_model);
+                    video_active_model.single_page = Set(Some(pages.len() == 1));
+                    video_active_model.tags = Set(Some(serde_json::to_value(tags)?));
+                    let txn = connection.begin().await?;
+                    create_pages(pages, &txn).await?;
+                    video_active_model.save(&txn).await?;
+                    txn.commit().await?;
+                }
+            };
+            Ok::<_, anyhow::Error>(())
         })
         .collect::<FuturesUnordered<_>>();
     tasks.try_collect::<Vec<_>>().await?;

docs/.vitepress/config.mts

@@ -21,7 +21,7 @@ export default defineConfig({
 		nav: [
 			{ text: "主页", link: "/" },
 			{
-				text: "v2.6.2",
+				text: "v2.6.3",
 				items: [
 					{
 						text: "程序更新",

docs/introduction.md

@@ -1,7 +1,7 @@
 # bili-sync 是什么？
 
 > [!TIP]
-> 当前最新程序版本为 v2.6.2，文档将始终与最新程序版本保持一致。
+> 当前最新程序版本为 v2.6.3，文档将始终与最新程序版本保持一致。
 
 bili-sync 是一款专为 NAS 用户编写的哔哩哔哩同步工具。
 

web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bili-sync-web",
-	"version": "2.6.2",
+	"version": "2.6.3",
 	"devDependencies": {
 		"@eslint/compat": "^1.2.5",
 		"@eslint/js": "^9.18.0",