snapshot

Author: DataEraserC

Cargo.lock

@@ -10,10 +10,14 @@ panic = "abort"
 strip = true
 
 [workspace.dependencies]
+#pq-sys = { version = "0.6", features = ["bundled"] }
+#openssl-sys = { version = "0.9.100", features = ["vendored"] }
+#libsqlite3-sys = { version = "0.30", features = ["bundled"] }
+#mysqlclient-sys = { version = "0.4", features = ["bundled"] }
 diesel = { version = "2.2.0", features = [
     "sqlite",
-    # "mysql",
-    # "postgres",
+#    "mysql",
+#    "postgres",
     "chrono",
     "returning_clauses_for_sqlite_3_35",
 ] }

Cargo.toml

@@ -50,10 +50,3 @@ doc = false
 name = "create_file_group"
 doc = false
 
-[[bin]]
-name = "webapi"
-doc = false
-
-[[bin]]
-name = "webui"
-doc = false

file_classification_cli/Cargo.toml

@@ -7,3 +7,7 @@ edition = "2024"
 diesel = { workspace = true }
 dotenvy = { workspace = true }
 chrono = { workspace = true }
+#mysqlclient-sys = { workspace = true }
+#libsqlite3-sys = { workspace = true }
+#openssl-sys = { workspace = true }
+#pq-sys = { workspace = true }

file_classification_cli/src/bin/webapi.rs

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

file_classification_cli/src/bin/webui.rs

@@ -4,9 +4,9 @@ use crate::{
 	file_group::create_file_group,
 	groups::create_group,
 	internal::{
-		files,
-		groups::{find_group_by_name, mark_group_as_primary},
-		models::{File, Group, NewFile},
+        files,
+        groups::{find_group_by_name, mark_group_as_primary},
+        models::{File, Group, CreateFileDTO},
 	},
 	models::FileFilter,
 };
@@ -17,7 +17,7 @@ pub fn raw_create_file(
 	path_: &str,
 	group_id: i32,
 ) -> Result<File, AppError> {
-	let new_file = NewFile { type_, path: path_, group_id };
+	let new_file = CreateFileDTO { type_, path: path_, group_id };
 	files::create_file(conn, &new_file)
 }
 pub fn create_file(

file_classification_core/Cargo.toml

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

file_classification_core/src/file_group.rs

@@ -8,20 +8,20 @@ use crate::{
 use diesel::prelude::*;
 use std::fmt::{Debug, Formatter, Result as fmtResult};
 
-use super::{models::FileGroup, schema::file_groups};
+use super::{models::FileGroupDTO, schema::file_groups};
 
 pub fn create_file_group(
 	conn: &mut SqliteConnection,
 	file_id: i32,
 	group_id: i32,
-) -> Result<FileGroup, AppError> {
+) -> Result<FileGroupDTO, 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 = FileGroup { file_id, group_id };
+	let new_file_group = FileGroupDTO { 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,7 +30,7 @@ pub fn create_file_group(
 	let _ = result?;
 	Ok(new_file_group)
 }
-impl Debug for FileGroup {
+impl Debug for FileGroupDTO {
 	fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
 		write!(f, "FileGroup {{ file_id: {}, group_id: {} }}", self.file_id, self.group_id)
 	}