snapshot

Author: DataEraserC

Cargo.lock

@@ -1,5 +1,5 @@
-use file_classification_core::group_tag::create_group_tag;
 use file_classification_core::database::establish_connection;
+use file_classification_core::group_tag::create_group_tag;
 use std::io::{Write, stdin, stdout};
 
 fn main() {
@@ -21,7 +21,7 @@ fn main() {
 	let result = create_group_tag(connection, group_id, tag_id);
 	match result {
 		Ok(new_group_tag) => {
-			println!("GroupTag created successfully!NewGroupTag<{:?}>", new_group_tag)
+			println!("GroupTag created successfully!GroupTag<{:?}>", new_group_tag)
 		}
 		Err(e) => eprintln!("Error creating GroupTag: {}", e),
 	}

file_classification_cli/src/bin/create_group_tag.rs

@@ -11,49 +11,53 @@ pub enum AppError {
 	// File errors
 	FileNotFound,
 	CreateFileFailed(String),
+	DeleteFileFailed(String),
 
 	// Tag errors
 	TagNotFound,
 	CreateTagFailed(String),
+	DeleteTagFailed(String),
 
-	// NewGroupTag errors
-	NewGroupTagNotFound,
+	// GroupTag errors
+	GroupTagNotFound,
 	CannotAssociateWithPrimary,
-	CreateNewGroupTagFailed(String),
-	DeleteNewGroupTagFailed(String),
+	CreateGroupTagFailed(String),
+	DeleteGroupTagFailed(String),
 
-	// NewFileGroup errors
-	NewFileGroupNotFound,
-	CreateNewFileGroupFailed(String),
-	DeleteNewFileGroupFailed(String),
-
-	// DieselError errors
-	DieselError(DieselError),
+	// FileGroup errors
+	FileGroupNotFound,
+	CreateFileGroupFailed(String),
+	DeleteFileGroupFailed(String),
 
 	// Validation errors
 	ValidationError(String),
+
+	// DieselError errors
+	DieselError(DieselError),
 }
 
 impl Display for AppError {
 	fn fmt(&self, f: &mut Formatter) -> Result {
 		match self {
 			AppError::GroupNotFound => write!(f, "Group not found"),
 			AppError::CreateGroupFailed(msg) => write!(f, "Create group failed: {}", msg),
-			AppError::DieselError(e) => write!(f, "Database error: {}", e),
-			AppError::ValidationError(msg) => write!(f, "Validation error: {}", msg),
 			AppError::DeleteGroupFailed(msg) => write!(f, "Delete group failed: {}", msg),
 			AppError::FileNotFound => write!(f, "File not found"),
 			AppError::CreateFileFailed(msg) => write!(f, "Create file failed: {}", msg),
+			AppError::DeleteFileFailed(msg) => write!(f, "Delete file failed: {}", msg),
 			AppError::TagNotFound => write!(f, "Tag not found"),
 			AppError::CreateTagFailed(msg) => write!(f, "Create tag failed: {}", msg),
-			AppError::NewGroupTagNotFound => write!(f, "NewGroupTag not found"),
+			AppError::DeleteTagFailed(msg) => write!(f, "Delete tag failed: {}", msg),
+			AppError::GroupTagNotFound => write!(f, "GroupTag not found"),
 			AppError::CannotAssociateWithPrimary => write!(f, "Cannot associate with primary group"),
-			AppError::CreateNewGroupTagFailed(msg) => write!(f, "Create NewGroupTag failed: {}", msg),
-			AppError::DeleteNewGroupTagFailed(msg) => write!(f, "Delete NewGroupTag failed: {}", msg),
-			AppError::NewFileGroupNotFound => write!(f, "NewFileGroup not found"),
-			AppError::CreateNewFileGroupFailed(msg) => write!(f, "Create NewFileGroup failed: {}", msg),
-			AppError::DeleteNewFileGroupFailed(msg) => write!(f, "Delete NewFileGroup failed: {}", msg),
-			// 其他错误处理...
+			AppError::CreateGroupTagFailed(msg) => write!(f, "Create GroupTag failed: {}", msg),
+			AppError::DeleteGroupTagFailed(msg) => write!(f, "Delete GroupTag failed: {}", msg),
+			AppError::FileGroupNotFound => write!(f, "FileGroup not found"),
+			AppError::CreateFileGroupFailed(msg) => write!(f, "Create FileGroup failed: {}", msg),
+			AppError::DeleteFileGroupFailed(msg) => write!(f, "Delete FileGroup failed: {}", msg),
+			AppError::ValidationError(msg) => write!(f, "Validation error: {}", msg),
+			AppError::DieselError(e) => write!(f, "Database error: {}", e),
+			// other Errors...
 			_ => write!(f, "Unknown error occurred"),
 		}
 	}

file_classification_core/src/errors.rs

@@ -1,13 +1,13 @@
 use diesel::SqliteConnection;
 
 use crate::errors::AppError;
-use crate::internal::models::NewFileGroup;
 use crate::internal::file_group as file_groups;
+use crate::internal::models::FileGroup;
 
 pub fn create_file_group(
 	conn: &mut SqliteConnection,
 	file_id: i32,
 	group_id: i32,
-) -> Result<NewFileGroup, AppError> {
-file_groups::create_file_group(conn, file_id, group_id)
-}
+) -> Result<FileGroup, AppError> {
+	file_groups::create_file_group(conn, file_id, group_id)
+}

file_classification_core/src/file_group.rs

@@ -1,13 +1,12 @@
 use diesel::SqliteConnection;
 
 use crate::errors::AppError;
-use crate::internal::models::NewGroupTag;
 use crate::internal::group_tag as group_tags;
+use crate::internal::models::GroupTag;
 pub fn create_group_tag(
 	conn: &mut SqliteConnection,
 	group_id: i32,
 	tag_id: i32,
-) -> Result<NewGroupTag, AppError> {
-group_tags::create_group_tag(conn, group_id, tag_id)
-
-}
+) -> Result<GroupTag, AppError> {
+	group_tags::create_group_tag(conn, group_id, tag_id)
+}

file_classification_core/src/group_tag.rs

@@ -1,27 +1,27 @@
 use crate::{
 	errors::AppError,
-	internal::{files::increase_file_reference_count,
-	groups::{increase_group_reference_count, find_group_by_id}}
+	internal::{
+		files::increase_file_reference_count,
+		groups::{find_group_by_id, increase_group_reference_count},
+	},
 };
 use diesel::prelude::*;
 use std::fmt::{Debug, Formatter, Result as fmtResult};
 
-use super::{models::NewFileGroup, schema::file_groups};
+use super::{models::FileGroup, schema::file_groups};
 
 pub fn create_file_group(
 	conn: &mut SqliteConnection,
 	file_id: i32,
 	group_id: i32,
-) -> Result<NewFileGroup, AppError> {
-
-	let group = find_group_by_id(conn, group_id)?
-		.ok_or(AppError::GroupNotFound)?;
+) -> Result<FileGroup, AppError> {
+	let group = find_group_by_id(conn, group_id)?.ok_or(AppError::GroupNotFound)?;
 
 	if group.is_primary {
 		return Err(AppError::CannotAssociateWithPrimary);
 	}
 
-	let new_file_group = NewFileGroup { file_id, group_id };
+	let new_file_group = FileGroup { file_id, group_id };
 	let result = conn.transaction::<_, AppError, _>(|conn| {
 		increase_file_reference_count(conn, file_id)?;
 		increase_group_reference_count(conn, group_id)?;
@@ -30,8 +30,8 @@ pub fn create_file_group(
 	let _ = result?;
 	Ok(new_file_group)
 }
-impl Debug for NewFileGroup {
+impl Debug for FileGroup {
 	fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
-		write!(f, "NewFileGroup {{ file_id: {}, group_id: {} }}", self.file_id, self.group_id)
+		write!(f, "FileGroup {{ file_id: {}, group_id: {} }}", self.file_id, self.group_id)
 	}
-}
+}

file_classification_core/src/internal/file_group.rs

@@ -1,6 +1,10 @@
+use super::{
+	models::{File, NewFile, SearchFile},
+	schema::files,
+	schema::files::dsl::*,
+};
 use crate::errors::AppError;
 use diesel::prelude::*;
-use super::{models::{File, NewFile,SearchFile}, schema::files,schema::files::dsl::*};
 
 pub fn create_file(conn: &mut SqliteConnection, new_file: &NewFile) -> Result<File, AppError> {
 	diesel::insert_into(files::table)
@@ -14,7 +18,6 @@ pub fn increase_file_reference_count(
 	conn: &mut SqliteConnection,
 	file_id: i32,
 ) -> Result<(), AppError> {
-
 	diesel::update(files::table.find(file_id))
 		.set(files::reference_count.eq(files::reference_count + 1))
 		.execute(conn)?;
@@ -39,7 +42,6 @@ pub fn select_files(
 	search_input: SearchFile,
 	limit: i64,
 ) -> Result<Vec<File>, diesel::result::Error> {
-
 	// 使用 into_boxed() 来对查询进行类型擦除
 	let mut base_query = files.limit(limit).select(File::as_select()).into_boxed();
 
@@ -75,8 +77,8 @@ impl Debug for File {
 	fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
 		write!(
 			f,
-			"File {{ id: {}, type_: {}, path: {},reference_count: {}, group_id: {} }}",
+			"File {{ id: {}, type_: {}, path: {}, reference_count: {}, group_id: {} }}",
 			self.id, self.type_, self.path, self.reference_count, self.group_id
 		)
 	}
-}
+}

file_classification_core/src/internal/files.rs

@@ -1,17 +1,16 @@
-use crate::
-	errors::AppError;
-use diesel::prelude::*;
-use std::fmt::{Debug, Formatter, Result as fmtResult};
 use super::{
-    groups::increase_group_reference_count,tags::increase_tag_reference_count,  models::NewGroupTag, schema::group_tags
+	groups::increase_group_reference_count, models::GroupTag, schema::group_tags,
+	tags::increase_tag_reference_count,
 };
+use crate::errors::AppError;
+use diesel::prelude::*;
+use std::fmt::{Debug, Formatter, Result as fmtResult};
 pub fn create_group_tag(
 	conn: &mut SqliteConnection,
 	group_id: i32,
 	tag_id: i32,
-) -> Result<NewGroupTag, AppError> {
-
-	let new_group_tag = NewGroupTag { group_id, tag_id };
+) -> Result<GroupTag, AppError> {
+	let new_group_tag = GroupTag { group_id, tag_id };
 	let result = conn.transaction::<_, AppError, _>(|conn| {
 		increase_group_reference_count(conn, group_id)?;
 		increase_tag_reference_count(conn, tag_id)?;
@@ -20,8 +19,8 @@ pub fn create_group_tag(
 	let _ = result?;
 	Ok(new_group_tag)
 }
-impl Debug for NewGroupTag {
+impl Debug for GroupTag {
 	fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
-		write!(f, "NewGroupTag {{ group_id: {}, tag_id: {} }}", self.group_id, self.tag_id)
+		write!(f, "GroupTag {{ group_id: {}, tag_id: {} }}", self.group_id, self.tag_id)
 	}
-}
+}