From 51672e8607e88cdf058a846a34c061551d8d8368 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: Sat, 1 Feb 2025 18:47:27 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BD=BF=E7=94=A8=20tokio::spawn=20?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E4=B8=BB=E4=BB=BB=E5=8A=A1=20(#237)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/bili_sync/src/adapter/collection.rs | 5 +- crates/bili_sync/src/adapter/favorite.rs | 5 +- crates/bili_sync/src/adapter/mod.rs | 5 +- crates/bili_sync/src/adapter/submission.rs | 5 +- crates/bili_sync/src/adapter/watch_later.rs | 5 +- crates/bili_sync/src/main.rs | 52 +++++++++++---------- crates/bili_sync/src/workflow.rs | 6 +-- 7 files changed, 50 insertions(+), 33 deletions(-) diff --git a/crates/bili_sync/src/adapter/collection.rs b/crates/bili_sync/src/adapter/collection.rs index d74b704..d82f0d7 100644 --- a/crates/bili_sync/src/adapter/collection.rs +++ b/crates/bili_sync/src/adapter/collection.rs @@ -76,7 +76,10 @@ pub(super) async fn collection_from<'a>( path: &Path, bili_client: &'a BiliClient, connection: &DatabaseConnection, -) -> Result<(VideoListModelEnum, Pin> + 'a>>)> { +) -> Result<( + VideoListModelEnum, + Pin> + 'a + Send>>, +)> { let collection = Collection::new(bili_client, collection_item); let collection_info = collection.get_info().await?; collection::Entity::insert(collection::ActiveModel { diff --git a/crates/bili_sync/src/adapter/favorite.rs b/crates/bili_sync/src/adapter/favorite.rs index 4d067fd..fe5fc51 100644 --- a/crates/bili_sync/src/adapter/favorite.rs +++ b/crates/bili_sync/src/adapter/favorite.rs @@ -67,7 +67,10 @@ pub(super) async fn favorite_from<'a>( path: &Path, bili_client: &'a BiliClient, connection: &DatabaseConnection, -) -> Result<(VideoListModelEnum, Pin> + 'a>>)> { +) -> Result<( + VideoListModelEnum, + Pin> + 'a + Send>>, +)> { let favorite = FavoriteList::new(bili_client, fid.to_owned()); let favorite_info = favorite.get_info().await?; favorite::Entity::insert(favorite::ActiveModel { diff --git a/crates/bili_sync/src/adapter/mod.rs b/crates/bili_sync/src/adapter/mod.rs index 0605ced..b89e2ac 100644 --- a/crates/bili_sync/src/adapter/mod.rs +++ b/crates/bili_sync/src/adapter/mod.rs @@ -84,7 +84,10 @@ pub async fn video_list_from<'a>( path: &Path, bili_client: &'a BiliClient, connection: &DatabaseConnection, -) -> Result<(VideoListModelEnum, Pin> + 'a>>)> { +) -> Result<( + VideoListModelEnum, + Pin> + 'a + Send>>, +)> { match args { Args::Favorite { fid } => favorite_from(fid, path, bili_client, connection).await, Args::Collection { collection_item } => collection_from(collection_item, path, bili_client, connection).await, diff --git a/crates/bili_sync/src/adapter/submission.rs b/crates/bili_sync/src/adapter/submission.rs index e0a8575..366dbba 100644 --- a/crates/bili_sync/src/adapter/submission.rs +++ b/crates/bili_sync/src/adapter/submission.rs @@ -67,7 +67,10 @@ pub(super) async fn submission_from<'a>( path: &Path, bili_client: &'a BiliClient, connection: &DatabaseConnection, -) -> Result<(VideoListModelEnum, Pin> + 'a>>)> { +) -> Result<( + VideoListModelEnum, + Pin> + 'a + Send>>, +)> { let submission = Submission::new(bili_client, upper_id.to_owned()); let upper = submission.get_info().await?; submission::Entity::insert(submission::ActiveModel { diff --git a/crates/bili_sync/src/adapter/watch_later.rs b/crates/bili_sync/src/adapter/watch_later.rs index 979ced8..c0f96dd 100644 --- a/crates/bili_sync/src/adapter/watch_later.rs +++ b/crates/bili_sync/src/adapter/watch_later.rs @@ -66,7 +66,10 @@ pub(super) async fn watch_later_from<'a>( path: &Path, bili_client: &'a BiliClient, connection: &DatabaseConnection, -) -> Result<(VideoListModelEnum, Pin> + 'a>>)> { +) -> Result<( + VideoListModelEnum, + Pin> + 'a + Send>>, +)> { let watch_later = WatchLater::new(bili_client); watch_later::Entity::insert(watch_later::ActiveModel { id: Set(1), diff --git a/crates/bili_sync/src/main.rs b/crates/bili_sync/src/main.rs index ffb7dc9..416cd0e 100644 --- a/crates/bili_sync/src/main.rs +++ b/crates/bili_sync/src/main.rs @@ -31,35 +31,37 @@ async fn main() { let mut anchor = chrono::Local::now().date_naive(); let bili_client = BiliClient::new(); let params = build_params(); - loop { - 'inner: { - match bili_client.wbi_img().await.map(|wbi_img| wbi_img.into()) { - Ok(Some(mixin_key)) => bilibili::set_global_mixin_key(mixin_key), - Ok(_) => { - error!("解析 mixin key 失败，等待下一轮执行"); - break 'inner; + tokio::spawn(async move { + loop { + 'inner: { + match bili_client.wbi_img().await.map(|wbi_img| wbi_img.into()) { + Ok(Some(mixin_key)) => bilibili::set_global_mixin_key(mixin_key), + Ok(_) => { + error!("解析 mixin key 失败，等待下一轮执行"); + break 'inner; + } + Err(e) => { + error!("获取 mixin key 遇到错误：{e}，等待下一轮执行"); + break 'inner; + } + }; + if anchor != chrono::Local::now().date_naive() { + if let Err(e) = bili_client.check_refresh().await { + error!("检查刷新 Credential 遇到错误：{e}，等待下一轮执行"); + break 'inner; + } + anchor = chrono::Local::now().date_naive(); } - Err(e) => { - error!("获取 mixin key 遇到错误：{e}，等待下一轮执行"); - break 'inner; + for (args, path) in ¶ms { + if let Err(e) = process_video_list(*args, &bili_client, path, &connection).await { + error!("处理过程遇到错误：{e}"); + } } - }; - if anchor != chrono::Local::now().date_naive() { - if let Err(e) = bili_client.check_refresh().await { - error!("检查刷新 Credential 遇到错误：{e}，等待下一轮执行"); - break 'inner; - } - anchor = chrono::Local::now().date_naive(); + info!("本轮任务执行完毕，等待下一轮执行"); } - for (args, path) in ¶ms { - if let Err(e) = process_video_list(*args, &bili_client, path, &connection).await { - error!("处理过程遇到错误：{e}"); - } - } - info!("本轮任务执行完毕，等待下一轮执行"); + time::sleep(time::Duration::from_secs(CONFIG.interval)).await; } - time::sleep(time::Duration::from_secs(CONFIG.interval)).await; - } + }); } fn build_params() -> Vec<(Args<'static>, &'static PathBuf)> { diff --git a/crates/bili_sync/src/workflow.rs b/crates/bili_sync/src/workflow.rs index d631b7d..62ff587 100644 --- a/crates/bili_sync/src/workflow.rs +++ b/crates/bili_sync/src/workflow.rs @@ -50,7 +50,7 @@ pub async fn process_video_list( /// 请求接口，获取视频列表中所有新添加的视频信息，将其写入数据库 pub async fn refresh_video_list<'a>( video_list_model: &VideoListModelEnum, - video_streams: Pin> + 'a>>, + video_streams: Pin> + 'a + Send>>, connection: &DatabaseConnection, ) -> Result<()> { video_list_model.log_refresh_video_start(); @@ -223,7 +223,7 @@ pub async fn download_video_pages( let is_single_page = video_model.single_page.context("single_page is null")?; // 对于单页视频，page 的下载已经足够 // 对于多页视频，page 下载仅包含了分集内容，需要额外补上视频的 poster 的 tvshow.nfo - let tasks: Vec>>>> = vec![ + let tasks: Vec> + Send>>> = vec![ // 下载视频封面 Box::pin(fetch_video_poster( seprate_status[0] && !is_single_page, @@ -413,7 +413,7 @@ pub async fn download_page( dimension, ..Default::default() }; - let tasks: Vec>>>> = vec![ + let tasks: Vec> + Send>>> = vec![ Box::pin(fetch_page_poster( seprate_status[0], video_model,