tmp save

Author: DataEraserC

Cargo.lock

@@ -2,7 +2,7 @@
 # see https://diesel.rs/guides/configuring-diesel-cli
 
 [print_schema]
-file = "file_classification_core/src/schema.rs"
+file = "file_classification_core/src/internal/schema.rs"
 custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
 
 [migrations_directory]

diesel.toml

@@ -1,7 +1,7 @@
 [package]
 name = "file_classification_cli"
-version = "0.1.0"
-edition = "2021"
+version = "0.2.0"
+edition = "2024"
 
 [dependencies]
 file_classification_core = { path = "../file_classification_core" }

file_classification_cli/Cargo.toml

@@ -1,5 +1,5 @@
-use file_classification_core::create_file;
-use file_classification_core::establish_connection;
+use file_classification_core::files::create_file;
+use file_classification_core::database::establish_connection;
 use std::io::stdin;
 
 fn main() {
@@ -10,22 +10,22 @@ fn main() {
 	let mut path = String::new();
 
 	println!("Please input File Name:");
-	stdin().read_line(&mut type_).unwrap();
-	let type_ = type_.trim_end();
-
-	println!("Please input File Type:");
 	stdin().read_line(&mut name).unwrap();
 	let name = name.trim_end();
 
+	println!("Please input File Type:");
+	stdin().read_line(&mut type_).unwrap();
+	let type_ = type_.trim_end();
+
 	println!("Please input File Path:");
 	stdin().read_line(&mut path).unwrap();
 	let path = path.trim_end();
 
-	let result = create_file(connection, name, path, &type_);
+	let result = create_file(connection, name, type_, path);
 	match result {
 		Ok((file, group)) => {
-			println!("\nSaved file {path} with id {}", file.id);
-			println!("Saved group {type_} with id {}", group.id);
+			println!("File created successfully!(File<{:?}>)", file);
+			println!("Group created successfully!(Group<{:?}>)", group);
 		}
 		Err(e) => {
 			eprintln!("An error occurred: {}", e);

file_classification_cli/src/bin/create_file.rs

@@ -1,6 +1,6 @@
-use file_classification_core::create_file_group;
-use file_classification_core::establish_connection;
-use std::io::{stdin, stdout, Write};
+use file_classification_core::file_group::create_file_group;
+use file_classification_core::database::establish_connection;
+use std::io::{Write, stdin, stdout};
 
 fn main() {
 	let connection = &mut establish_connection();
@@ -19,10 +19,11 @@ fn main() {
 	let group_id: i32 = group_id_input.trim().parse().expect("Invalid Group ID");
 
 	let result = create_file_group(connection, file_id, group_id);
-	if result.is_ok() {
-		println!("\nFile ID {} added to Group ID {}", file_id, group_id);
-	} else {
-		println!("\nFailed to add File ID {} to Group ID {}", file_id, group_id);
+	match result {
+		Ok(new_file_group) => {
+			println!("FileGroup created successfully!NewFileGroup<{:?}>", new_file_group)
+		}
+		Err(e) => eprintln!("Error creating FileGroup: {}", e),
 	}
 }
 

file_classification_cli/src/bin/create_file_group.rs

@@ -1,5 +1,5 @@
-use file_classification_core::create_group;
-use file_classification_core::establish_connection;
+use file_classification_core::groups::create_group;
+use file_classification_core::database::establish_connection;
 use std::io::stdin;
 
 fn main() {
@@ -14,7 +14,7 @@ fn main() {
 	let group = create_group(connection, name);
 	match group {
 		Ok(group) => {
-			println!("\nGroup {} created successfully, ID: {}", group.name, group.id);
+			println!("Group created successfully!(Group<{:?}>)", group);
 		}
 		Err(e) => {
 			println!("\nError creating group: {}", e);

file_classification_cli/src/bin/create_group.rs

@@ -1,6 +1,6 @@
-use file_classification_core::create_group_tag;
-use file_classification_core::establish_connection;
-use std::io::{stdin, stdout, Write};
+use file_classification_core::group_tag::create_group_tag;
+use file_classification_core::database::establish_connection;
+use std::io::{Write, stdin, stdout};
 
 fn main() {
 	let connection = &mut establish_connection();
@@ -19,10 +19,11 @@ fn main() {
 	let tag_id: i32 = tag_id_input.trim().parse().expect("Invalid Tag ID");
 
 	let result = create_group_tag(connection, group_id, tag_id);
-	if result.is_ok() {
-		println!("\nTag ID {} added to Group ID {}", tag_id, group_id);
-	} else {
-		println!("\nFailed to add Tag ID {} to Group ID {}", tag_id, group_id);
+	match result {
+		Ok(new_group_tag) => {
+			println!("GroupTag created successfully!NewGroupTag<{:?}>", new_group_tag)
+		}
+		Err(e) => eprintln!("Error creating GroupTag: {}", e),
 	}
 }
 

file_classification_cli/src/bin/create_group_tag.rs

@@ -1,5 +1,5 @@
-use file_classification_core::create_tag;
-use file_classification_core::establish_connection;
+use file_classification_core::tags::create_tag;
+use file_classification_core::database::establish_connection;
 use std::io::stdin;
 
 fn main() {
@@ -14,7 +14,7 @@ fn main() {
 	let tag = create_tag(connection, name);
 	match tag {
 		Ok(tag) => {
-			println!("\nCreated tag {name} with id {}", tag.id);
+			println!("Tag created successfully!(Tag<{:?}>)", tag);
 		}
 		Err(e) => {
 			println!("\nError creating tag: {}", e);

file_classification_cli/src/bin/create_tag.rs

@@ -1,5 +1,5 @@
-use file_classification_core::delete_file;
-use file_classification_core::establish_connection;
+use file_classification_core::files::delete_file;
+use file_classification_core::database::establish_connection;
 use std::io;
 fn main() {
 	let connection = &mut establish_connection();

file_classification_cli/src/bin/delete_file.rs

@@ -1,5 +1,5 @@
-use file_classification_core::delete_group;
-use file_classification_core::establish_connection;
+use file_classification_core::groups::delete_group;
+use file_classification_core::database::establish_connection;
 use std::io;
 fn main() {
 	let connection = &mut establish_connection();