refactor: 重构部分代码，调整函数位置 (#154)

crates/bili_sync/src/adapter/mod.rs

@@ -1,5 +1,6 @@
 mod collection;
 mod favorite;
+mod helper;
 mod watch_later;
 
 use std::collections::HashSet;
@@ -8,15 +9,14 @@ use std::pin::Pin;
 
 use anyhow::Result;
 use async_trait::async_trait;
-pub use collection::collection_from;
-pub use favorite::favorite_from;
+use collection::collection_from;
+use favorite::favorite_from;
 use futures::Stream;
 use sea_orm::entity::prelude::*;
-use sea_orm::ActiveValue::Set;
 use sea_orm::DatabaseConnection;
 use watch_later::watch_later_from;
 
-use crate::bilibili::{self, BiliClient, BiliError, CollectionItem, VideoInfo};
+use crate::bilibili::{self, BiliClient, CollectionItem, VideoInfo};
 
 pub enum Args<'a> {
     Favorite { fid: &'a str },
@@ -37,51 +37,32 @@ pub async fn video_list_from<'a>(
     }
 }
 
-async fn error_fetch_video_detail(
-    e: anyhow::Error,
-    video_model: bili_sync_entity::video::Model,
-    connection: &DatabaseConnection,
-) -> Result<()> {
-    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(())
-}
-
 #[async_trait]
 pub trait VideoListModel {
-    /* 逻辑相关 */
-
-    /// 获取与视频列表关联的视频总数
+    /// 与视频列表关联的视频总数
     async fn video_count(&self, connection: &DatabaseConnection) -> Result<u64>;
 
-    /// 获取未填充的视频
+    /// 未填充的视频
     async fn unfilled_videos(&self, connection: &DatabaseConnection) -> Result<Vec<bili_sync_entity::video::Model>>;
 
-    /// 获取未处理的视频和分页
+    /// 未处理的视频和分页
     async fn unhandled_video_pages(
         &self,
         connection: &DatabaseConnection,
     ) -> Result<Vec<(bili_sync_entity::video::Model, Vec<bili_sync_entity::page::Model>)>>;
 
-    /// 获取该批次视频的存在标记
+    /// 该批次视频的存在标记
     async fn exist_labels(&self, videos_info: &[VideoInfo], connection: &DatabaseConnection)
         -> Result<HashSet<String>>;
 
-    /// 获取视频信息对应的视频 model
+    /// 视频信息对应的视频 model
     fn video_model_by_info(
         &self,
         video_info: &VideoInfo,
         base_model: Option<bili_sync_entity::video::Model>,
     ) -> bili_sync_entity::video::ActiveModel;
 
-    /// 获取视频 model 中缺失的信息
+    /// 视频 model 中缺失的信息
     async fn fetch_videos_detail(
         &self,
         video: bilibili::Video<'_>,
@@ -89,16 +70,21 @@ pub trait VideoListModel {
         connection: &DatabaseConnection,
     ) -> Result<()>;
 
-    /* 日志相关 */
+    /// 开始获取视频
     fn log_fetch_video_start(&self);
 
+    /// 结束获取视频
     fn log_fetch_video_end(&self);
 
+    /// 开始下载视频
     fn log_download_video_start(&self);
 
+    /// 结束下载视频
     fn log_download_video_end(&self);
 
+    /// 开始刷新视频
     fn log_refresh_video_start(&self);
 
+    /// 结束刷新视频
     fn log_refresh_video_end(&self, got_count: usize, new_count: u64);
 }