chore: 修改 rebase 后的一些小问题

amtoaer · Jun 15, 2024 · 39481e6 · 39481e6
1 parent 107feac
commit 39481e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/crates/bili_sync/src/bilibili/collection.rs b/crates/bili_sync/src/bilibili/collection.rs
@@ -189,7 +189,7 @@ mod tests {
     use futures::{pin_mut, StreamExt};
 
     use super::*;
-    use crate::core::utils::init_logging;
+    use crate::core::utils::init_logger;
 
     #[test]
     fn test_collection_info_parse() {
@@ -251,7 +251,7 @@ mod tests {
     #[ignore = "only for manual test"]
     #[tokio::test]
     async fn test_get_info() {
-        init_logging().expect("初始化日志失败");
+        init_logger("None,bili_sync=info");
         let client = BiliClient::new();
         let testcases = vec![
             (

diff --git a/crates/bili_sync/src/core/utils.rs b/crates/bili_sync/src/core/utils.rs
@@ -53,19 +53,6 @@ pub enum ModelWrapper<'a> {
 
 pub struct NFOSerializer<'a>(pub ModelWrapper<'a>, pub NFOMode);
 
-// 初始化日志
-pub fn init_logging() -> Result<()> {
-    let default_log_level = std::env::var("RUST_LOG").unwrap_or("None,bili_sync=info".to_owned());
-    tracing_subscriber::fmt::Subscriber::builder()
-        .with_env_filter(tracing_subscriber::EnvFilter::builder().parse_lossy(default_log_level))
-        .with_timer(tracing_subscriber::fmt::time::ChronoLocal::new(
-            "%Y-%m-%d %H:%M:%S%.3f".to_owned(),
-        ))
-        .finish()
-        .try_init()?;
-    Ok(())
-}
-
 /// 根据获得的收藏夹信息，插入或更新数据库中的收藏夹，并返回收藏夹对象
 pub async fn handle_favorite_info(
     info: &FavoriteListInfo,

diff --git a/crates/bili_sync/src/main.rs b/crates/bili_sync/src/main.rs
@@ -8,18 +8,15 @@ mod database;
 mod downloader;
 mod error;
 
-use core::utils::init_logging;
-
-use core::utils::init_logging;
-
 use std::time::Duration;
 
 use config::ARGS;
 use once_cell::sync::Lazy;
+use tokio::time;
 
 use crate::bilibili::BiliClient;
 use crate::config::CONFIG;
-use crate::core::command::process_collection, process_favorite_list;
+use crate::core::command::{process_collection, process_favorite_list};
 use crate::core::utils::init_logger;
 use crate::database::{database_connection, migrate_database};