snapshot

Author: DataEraserC

file_classification_cli/src/bin/list_files.rs

@@ -1,8 +1,10 @@
 use file_classification_core::model::models::FileFilter;
+#[allow(deprecated)]
 use file_classification_core::service::files::select_files;
 use file_classification_core::utils::database::establish_connection;
 // 引入select_files和SearchFile
 
+#[allow(deprecated)]
 fn main() {
     let connection = &mut establish_connection();
 

file_classification_cli/src/bin/list_groups.rs

@@ -1,8 +1,10 @@
 use file_classification_core::model::models::GroupFilter;
+#[allow(deprecated)]
 use file_classification_core::service::groups::select_groups;
 use file_classification_core::utils::database::establish_connection;
 // 引入select_groups和SearchGroup
 
+#[allow(deprecated)]
 fn main() {
     let connection = &mut establish_connection();
 

file_classification_core/src/internal/file_group.rs

@@ -96,6 +96,7 @@ pub fn select_file_groups_by_conditions(
         .load(conn)
 }
 
+#[allow(dead_code)]
 pub fn select_file_groups_by_conditions_with_options(
     conn: &mut SqliteConnection,
     conditions: Vec<FileGroupCondition>,

file_classification_core/src/internal/files.rs

@@ -156,6 +156,7 @@ pub fn select_files_by_conditions(
         .load(conn)
 }
 
+#[allow(dead_code)]
 pub fn select_files_by_conditions_with_options(
     conn: &mut SqliteConnection,
     conditions: Vec<FileCondition>,

file_classification_core/src/internal/group_tag.rs

@@ -102,6 +102,7 @@ pub fn select_group_tags_by_conditions(
         .load(conn)
 }
 
+#[allow(dead_code)]
 pub fn select_group_tags_by_conditions_with_options(
     conn: &mut SqliteConnection,
     conditions: Vec<GroupTagCondition>,

file_classification_core/src/internal/groups.rs

@@ -26,13 +26,14 @@ pub fn find_group_by_id(
         .optional()
 }
 
+#[allow(dead_code)]
 pub fn mark_group_as_primary(conn: &mut SqliteConnection, group_id: i32) -> Result<usize, diesel::result::Error> {
     diesel::update(groups::table)
         .filter(groups::id.eq(group_id))
         .set(groups::is_primary.eq(true))
         .execute(conn)
 }
-
+#[allow(dead_code)]
 pub fn mark_group_as_non_primary(conn: &mut SqliteConnection) -> Result<usize, diesel::result::Error> {
     diesel::update(groups::table).set(groups::is_primary.eq(false)).execute(conn)
 }
@@ -204,6 +205,7 @@ pub fn select_groups_by_conditions(
 }
 
 
+#[allow(dead_code)]
 pub fn select_groups_by_conditions_with_options(
     conn: &mut SqliteConnection,
     conditions: Vec<GroupCondition>,

file_classification_core/src/internal/mod.rs

@@ -4,4 +4,5 @@ pub mod group_tag;
 pub mod groups;
 pub mod tags;
 use super::model::models;
+#[allow(unused_imports)]
 use super::utils::errors::AppError;

file_classification_core/src/internal/tags.rs

@@ -6,6 +6,7 @@ pub fn create_tag(
 ) -> Result<Tag, diesel::result::Error> {
     diesel::insert_into(tags::table).values(&new_tag).returning(Tag::as_returning()).get_result(conn)
 }
+#[allow(dead_code)]
 pub fn find_tag_by_name(
     conn: &mut SqliteConnection,
     tag_name: &str,
@@ -142,6 +143,7 @@ pub fn select_tags_by_conditions(
         .load(conn)
 }
 
+#[allow(dead_code)]
 pub fn select_tags_by_conditions_with_options(
     conn: &mut SqliteConnection,
     conditions: Vec<TagCondition>,

file_classification_core/src/service/file_group.rs

@@ -15,15 +15,15 @@ pub fn create_file_group(
     let group = find_group_by_id(conn, file_group_dto.group_id)?
         .ok_or(AppError::GroupNotFound)?;
 
-    let file = find_file_by_id(conn, file_group_dto.file_id)?
+    let _file = find_file_by_id(conn, file_group_dto.file_id)?
         .ok_or(AppError::FileNotFound)?;
 
     if group.is_primary {
         return Err(AppError::CannotBindToPrimaryGroup);
     }
 
     // 使用事务处理引用计数和数据插入
-    let result = conn.transaction::<_, AppError, _>(|conn| {
+    let _result = conn.transaction::<_, AppError, _>(|conn| {
         increase_file_reference_count(conn, file_group_dto.file_id)?;
         increase_group_reference_count(conn, file_group_dto.group_id)?;
         // 错误类型转换，将 diesel::result::Error 转换为 AppError
@@ -38,10 +38,10 @@ pub fn delete_file_group(
     conn: &mut SqliteConnection,
     file_group_dto: FileGroupDTO,
 ) -> Result<usize, AppError> {
-    let mut group = find_group_by_id(conn, file_group_dto.group_id)?
+    let group = find_group_by_id(conn, file_group_dto.group_id)?
         .ok_or(AppError::GroupNotFound)?;
 
-    let mut file = find_file_by_id(conn, file_group_dto.file_id)?
+    let _file = find_file_by_id(conn, file_group_dto.file_id)?
         .ok_or(AppError::FileNotFound)?;
 
     if group.is_primary {

file_classification_core/src/service/files.rs

@@ -44,50 +44,53 @@ pub fn raw_create_file(
 // }
 
 pub fn create_file(conn: &mut SqliteConnection, create_file_dto: CreateFileDTO) -> Result<usize, AppError> {
-    let group_list = select_groups_by_conditions(conn, vec![
-        GroupCondition::Id(create_file_dto.group_id)
-    ], None)?;
-    let Some(group) = group_list.get(0) else { todo!() };
-    let file_groups = select_file_groups_by_conditions(
-        conn,
-        vec![
-            FileGroupCondition::GroupId(create_file_dto.group_id)
-        ], None,
-    )?;
-
-    if (file_groups.len() != 0) {
-        return Err(CannotBindToPrimaryGroup);
-    }
-    let mut count = 0;
-    count += internal::files::create_file(conn, &create_file_dto)?;
-    let file_list = internal::files::select_files_by_conditions(conn, vec![
-        FileCondition::GroupId(create_file_dto.group_id)
-    ], None)?;
-    let file = file_list.get(0).ok_or(AppError::FileNotFound)?;
-
-    update_groups_by_conditions(conn, vec![
-        GroupCondition::Id(group.id)
-    ], UpdateGroupDTO {
-        id: None,
-        name: None,
-        reference_count: None,
-        is_primary: Some(true),
-        click_count: None,
-        share_count: None,
-        create_time: None,
-        modify_time: None,
-    }).expect("Error when creating group");
-
-    match service::file_group::create_file_group(conn, FileGroupDTO { file_id: file.id, group_id: group.id }) {
-        Ok(_) => {
-            count += 1;
+    conn.transaction::<usize, AppError, _>(|conn| {
+        let group_list = select_groups_by_conditions(conn, vec![
+            GroupCondition::Id(create_file_dto.group_id)
+        ], None)?;
+        let Some(group) = group_list.get(0) else { todo!() };
+        let file_groups = select_file_groups_by_conditions(
+            conn,
+            vec![
+                FileGroupCondition::GroupId(create_file_dto.group_id)
+            ], None,
+        )?;
+
+        if file_groups.len() != 0 {
+            return Err(CannotBindToPrimaryGroup);
         }
-        Err(e) => {
-            return Err(e)
+        let mut count = 0;
+        count += internal::files::create_file(conn, &create_file_dto)?;
+        let file_list = internal::files::select_files_by_conditions(conn, vec![
+            FileCondition::GroupId(create_file_dto.group_id)
+        ], None)?;
+        let file = file_list.get(0).ok_or(AppError::FileNotFound)?;
+
+        update_groups_by_conditions(conn, vec![
+            GroupCondition::Id(group.id)
+        ], UpdateGroupDTO {
+            id: None,
+            name: None,
+            reference_count: None,
+            is_primary: Some(true),
+            click_count: None,
+            share_count: None,
+            create_time: None,
+            modify_time: None,
+        }).expect("Error when creating group");
+
+        match service::file_group::create_file_group(conn, FileGroupDTO { file_id: file.id, group_id: group.id }) {
+            Ok(_) => {
+                count += 1;
+            }
+            Err(e) => {
+                return Err(e)
+            }
         }
-    }
-    Ok(count)
+        Ok(count)
+    })
 }
+
 pub fn delete_file(conn: &mut SqliteConnection, file_id: i32) -> Result<(), AppError> {
     // 开始事务
     conn.transaction::<(), diesel::result::Error, _>(|conn| {
@@ -119,6 +122,7 @@ pub fn delete_file(conn: &mut SqliteConnection, file_id: i32) -> Result<(), AppE
 }
 
 
+#[allow(deprecated)]
 #[deprecated]
 pub fn select_files(
     conn: &mut SqliteConnection,