snapshot

Author: DataEraserC

file_classification_cli/src/bin/list_files.rs

@@ -1,12 +1,12 @@
 use file_classification_core::database::establish_connection;
-use file_classification_core::{models::SearchFile, files::select_files}; // 引入select_files和SearchFile
+use file_classification_core::{files::select_files, models::FileFilter}; // 引入select_files和SearchFile
 
 fn main() {
 	let connection = &mut establish_connection();
 
 	// 定义一个空的 SearchFile 来进行无条件查询
 	let search_input =
-		SearchFile { id: None, type_: None, path: None, reference_count: None, group_id: None };
+		FileFilter { id: None, type_: None, path: None, reference_count: None, group_id: None };
 
 	// 使用 select_files 函数进行查询
 	let results = select_files(connection, search_input, 5).expect("Error loading files");

file_classification_cli/src/bin/list_groups.rs

@@ -1,11 +1,11 @@
 use file_classification_core::database::establish_connection;
-use file_classification_core::{models::SearchGroup, groups::select_groups}; // 引入select_groups和SearchGroup
+use file_classification_core::{groups::select_groups, models::GroupFilter}; // 引入select_groups和SearchGroup
 
 fn main() {
 	let connection = &mut establish_connection();
 
 	// 定义一个空的 SearchGroup 来进行无条件查询
-	let search_input = SearchGroup {
+	let search_input = GroupFilter {
 		id: None,
 		name: None,
 		reference_count: None,

file_classification_cli/src/bin/list_tags.rs

@@ -1,11 +1,11 @@
 use file_classification_core::database::establish_connection;
-use file_classification_core::{models::SearchTag, tags::select_tags}; // 引入select_tags和SearchTag
+use file_classification_core::{models::TagFilter, tags::select_tags}; // 引入select_tags和SearchTag
 
 fn main() {
 	let connection = &mut establish_connection();
 
 	// 定义一个空的 SearchTag 来进行无条件查询
-	let search_input = SearchTag { id: None, name: None, reference_count: None };
+	let search_input = TagFilter { id: None, name: None, reference_count: None };
 
 	// 使用 select_tags 函数进行查询
 	let results = select_tags(connection, search_input, 5).expect("Error loading tags");

file_classification_core/src/files.rs

@@ -1,6 +1,14 @@
 use crate::{
-	database::SqliteConnection, errors::AppError, 
-	file_group::create_file_group, groups::create_group, internal::{files, groups::{find_group_by_name, mark_group_as_primary}, models::{File, Group, NewFile}}, models::SearchFile
+	database::SqliteConnection,
+	errors::AppError,
+	file_group::create_file_group,
+	groups::create_group,
+	internal::{
+		files,
+		groups::{find_group_by_name, mark_group_as_primary},
+		models::{File, Group, NewFile},
+	},
+	models::FileFilter,
 };
 
 pub fn raw_create_file(
@@ -42,8 +50,15 @@ pub fn delete_file(conn: &mut SqliteConnection, file_id: i32) -> Result<(), dies
 }
 pub fn select_files(
 	conn: &mut SqliteConnection,
-	search_input: SearchFile,
+	search_input: FileFilter,
 	limit: i64,
 ) -> Result<Vec<File>, diesel::result::Error> {
 	files::select_files(conn, search_input, limit)
-}
+}
+
+// pub fn update_file(
+// 	conn: &mut SqliteConnection,
+// 	update_input: FileFilter,
+// ) -> Result<File, diesel::result::Error> {
+// 	files::update_file(conn, update_input)
+// }

file_classification_core/src/groups.rs

@@ -1,6 +1,10 @@
 use crate::{
 	errors::AppError,
-	internal::{groups, models::{Group, NewGroup}}, models::SearchGroup,
+	internal::{
+		groups,
+		models::{Group, NewGroup},
+	},
+	models::GroupFilter,
 };
 use diesel::SqliteConnection;
 
@@ -24,8 +28,8 @@ pub fn delete_group(
 }
 pub fn select_groups(
 	conn: &mut SqliteConnection,
-	search_input: SearchGroup,
+	search_input: GroupFilter,
 	limit: i64,
 ) -> Result<Vec<Group>, diesel::result::Error> {
 	groups::select_groups(conn, search_input, limit)
-}
+}

file_classification_core/src/internal/files.rs

@@ -1,5 +1,5 @@
 use super::{
-	models::{File, NewFile, SearchFile},
+	models::{File, FileFilter, NewFile, UpdateFile},
 	schema::files,
 	schema::files::dsl::*,
 };
@@ -39,7 +39,7 @@ pub fn decrease_file_reference_count(
 
 pub fn select_files(
 	conn: &mut SqliteConnection,
-	search_input: SearchFile,
+	search_input: FileFilter,
 	limit: i64,
 ) -> Result<Vec<File>, diesel::result::Error> {
 	// 使用 into_boxed() 来对查询进行类型擦除
@@ -66,6 +66,46 @@ pub fn select_files(
 	base_query.load(conn)
 }
 
+// pub fn update_file(
+// 	conn: &mut SqliteConnection,
+// 	update_input: UpdateFile,
+// ) -> Result<usize, diesel::result::Error> {
+// 	// 初始化更新查询
+// 	let mut query = diesel::update(files).into_boxed();
+
+// 	// 动态设置需要更新的字段
+// 	if let Some(new_path) = update_input.set.path {
+// 		query = query.set(path.eq(new_path));
+// 	}
+// 	if let Some(new_type) = update_input.set.type_ {
+// 		query = query.set(type_.eq(new_type));
+// 	}
+// 	if let Some(new_ref_count) = update_input.set.reference_count {
+// 		query = query.set(reference_count.eq(new_ref_count));
+// 	}
+// 	if let Some(new_group) = update_input.set.group_id {
+// 		query = query.set(group_id.eq(new_group));
+// 	}
+
+// 	// 动态添加过滤条件
+// 	if let Some(file_id) = update_input.filter.id {
+// 		query = query.filter(id.eq(file_id));
+// 	}
+// 	if let Some(file_type) = update_input.filter.type_ {
+// 		query = query.filter(type_.eq(file_type));
+// 	}
+// 	if let Some(file_path) = update_input.filter.path {
+// 		query = query.filter(path.eq(file_path));
+// 	}
+// 	if let Some(ref_count) = update_input.filter.reference_count {
+// 		query = query.filter(reference_count.eq(ref_count));
+// 	}
+// 	if let Some(group) = update_input.filter.group_id {
+// 		query = query.filter(group_id.eq(group));
+// 	}
+// 	query.load(conn)
+// }
+
 pub fn delete_file(conn: &mut SqliteConnection, file_id: i32) -> Result<(), diesel::result::Error> {
 	match diesel::delete(files.filter(files::id.eq(file_id))).execute(conn) {
 		Ok(_) => Ok(()),

file_classification_core/src/internal/groups.rs

@@ -1,11 +1,10 @@
-use crate::
-	errors::AppError;
-use diesel::prelude::*;
 use super::{
-	models::{Group, NewGroup,SearchGroup},
+	models::{Group, GroupFilter, NewGroup},
 	schema::groups,
 	schema::groups::dsl::*,
 };
+use crate::errors::AppError;
+use diesel::prelude::*;
 pub fn create_group(conn: &mut SqliteConnection, new_group: &NewGroup) -> Result<Group, AppError> {
 	diesel::insert_into(groups::table)
 		.values(new_group)
@@ -18,7 +17,6 @@ pub fn find_group_by_name(
 	conn: &mut SqliteConnection,
 	group_name: &str,
 ) -> Result<Option<Group>, AppError> {
-
 	let group = groups
 		.select(Group::as_select())
 		.filter(groups::name.eq(group_name))
@@ -30,7 +28,6 @@ pub fn find_group_by_id(
 	conn: &mut SqliteConnection,
 	group_id: i32,
 ) -> Result<Option<Group>, AppError> {
-
 	let group = groups
 		.select(Group::as_select())
 		.filter(groups::id.eq(group_id))
@@ -39,11 +36,7 @@ pub fn find_group_by_id(
 	Ok(group)
 }
 
-pub fn mark_group_as_primary(
-	conn: &mut SqliteConnection,
-	group_id: i32,
-) -> Result<(), AppError> {
-
+pub fn mark_group_as_primary(conn: &mut SqliteConnection, group_id: i32) -> Result<(), AppError> {
 	diesel::update(groups::table)
 		.filter(groups::id.eq(group_id))
 		.set(groups::is_primary.eq(true))
@@ -61,10 +54,9 @@ pub fn mark_group_as_non_primary(conn: &mut SqliteConnection) -> Result<(), AppE
 
 pub fn select_groups(
 	conn: &mut SqliteConnection,
-	search_input: SearchGroup,
+	search_input: GroupFilter,
 	limit: i64,
 ) -> Result<Vec<Group>, diesel::result::Error> {
-
 	// 使用 into_boxed() 来对查询进行类型擦除
 	let mut base_query = groups.limit(limit).select(Group::as_select()).into_boxed();
 
@@ -113,7 +105,6 @@ pub fn increase_group_reference_count(
 	conn: &mut SqliteConnection,
 	group_id: i32,
 ) -> Result<(), AppError> {
-
 	diesel::update(groups::table.find(group_id))
 		.set(groups::reference_count.eq(groups::reference_count + 1))
 		.execute(conn)?;
@@ -125,7 +116,6 @@ pub fn decrease_group_reference_count(
 	conn: &mut SqliteConnection,
 	group_id: i32,
 ) -> Result<(), AppError> {
-
 	diesel::update(groups::table.find(group_id))
 		.set(groups::reference_count.eq(groups::reference_count - 1))
 		.execute(conn)?;
@@ -147,4 +137,4 @@ impl Debug for Group {
 			self.modify_time
 		)
 	}
-}
+}

file_classification_core/src/internal/models.rs

@@ -25,14 +25,26 @@ pub struct NewFile<'a, 'b> {
 
 // NOTE: you may find File is like SearchFile
 // it is bcs IDK how to unify them
-pub struct SearchFile {
+pub struct FileFilter {
 	pub id: Option<i32>,
 	pub type_: Option<String>,
 	pub path: Option<String>,
 	pub reference_count: Option<i32>,
 	pub group_id: Option<i32>,
 }
 
+struct FileSet {
+	pub path: Option<String>,
+	pub type_: Option<String>,
+	pub reference_count: Option<i32>,
+	pub group_id: Option<i32>,
+}
+
+pub struct UpdateFile {
+	pub set: FileSet,
+	pub filter: FileFilter,
+}
+
 // Group Related
 
 #[derive(Queryable, Selectable)]
@@ -57,7 +69,7 @@ pub struct NewGroup<'a> {
 
 // NOTE: you may find File is like SearchFile
 // it is bcs IDK how to unify them
-pub struct SearchGroup {
+pub struct GroupFilter {
 	pub id: Option<i32>,
 	pub name: Option<String>,
 	pub reference_count: Option<i32>,
@@ -68,6 +80,21 @@ pub struct SearchGroup {
 	pub modify_time: Option<chrono::NaiveDateTime>,
 }
 
+struct GroupSet {
+	pub name: Option<String>,
+	pub reference_count: Option<i32>,
+	pub is_primary: Option<bool>,
+	pub click_count: Option<i32>,
+	pub share_count: Option<i32>,
+	pub create_time: Option<chrono::NaiveDateTime>,
+	pub modify_time: Option<chrono::NaiveDateTime>,
+}
+
+pub struct UpdateGroup {
+	pub set: GroupSet,
+	pub filter: GroupFilter,
+}
+
 // Tag Related
 
 #[derive(Queryable, Selectable)]
@@ -85,12 +112,22 @@ pub struct NewTag<'a> {
 	pub name: &'a str,
 }
 
-pub struct SearchTag {
+pub struct TagFilter {
 	pub id: Option<i32>,
 	pub name: Option<String>,
 	pub reference_count: Option<i32>,
 }
 
+pub struct TagSet {
+	pub name: Option<String>,
+	pub reference_count: Option<i32>,
+}
+
+pub struct UpdateTag {
+	pub set: TagSet,
+	pub filter: TagFilter,
+}
+
 // FileGroup Related
 
 // NOTE: FileGroup == NewFileGroup