Merge branch 'develop'

Author: ziteh

.gitignore

@@ -1,5 +1,9 @@
+# Rust
 /target
 Cargo.lock
+
+# Elebox
 *.db
 *.csv
 *.tsv
+elebox_export*

elebox-cli/src/category_cmd.rs

@@ -1,4 +1,5 @@
 use clap::{Args, Subcommand};
+use elebox_core::Manager;
 
 #[derive(Debug, Args)]
 pub struct CategoryCommand {
@@ -47,8 +48,8 @@ struct ExportCategoryArgs {
     path: String,
 }
 
-pub fn category_cmd(db: &dyn elebox_core::Database, cmd: &CategoryCommand) {
-    let manager = elebox_core::CategoryManager::new(db);
+pub fn category_cmd(path: &str, cmd: &CategoryCommand) {
+    let manager = elebox_core::CategoryManager::new(path);
 
     match &cmd.command {
         Some(CategorySubCommand::New(args)) => {
@@ -57,30 +58,23 @@ pub fn category_cmd(db: &dyn elebox_core::Database, cmd: &CategoryCommand) {
                 args.parent_cat.as_deref(),
                 None, // TODO
             )) {
-                println!("{err}");
+                println!("ERR: {err}");
             };
         }
         Some(CategorySubCommand::Delete(args)) => {
             if let Err(err) = manager.delete(&args.name) {
-                print!("{err}");
+                println!("ERR: {err}");
             };
         }
-        Some(CategorySubCommand::Update(args)) => {
-            // TODO
-            // if let Err(err) = manager.update(
-            //     &args.old_name,
-            //     args.new_name.as_deref(),
-            //     args.parent_cat.as_deref(),
-            // ) {
-            //     println!("{err}");
-            // };
+        Some(CategorySubCommand::Update(_args)) => {
+            todo!();
         }
-        Some(CategorySubCommand::Export(args)) => {
-            let _ = manager.export(&args.path);
+        Some(CategorySubCommand::Export(_args)) => {
+            todo!();
         }
         None => {
             println!("List part category");
-            let pts = manager.list();
+            let pts = manager.list().unwrap();
             for pt in pts {
                 println!("{}  {:?}", pt.name, pt.parent);
             }

elebox-cli/src/main.rs

@@ -1,7 +1,7 @@
-use std::sync::atomic;
+
 
 use clap::{Args, Parser, Subcommand};
-use elebox_core::{self, Database};
+use elebox_core::{self};
 
 mod category_cmd;
 mod part_cmd;
@@ -46,16 +46,13 @@ enum EntityType {
 fn main() {
     let cli = Cli::parse();
 
-    println!("{}", cli.db_path);
-    let db = elebox_core::JammDatabase::new(&cli.db_path);
+    println!("Database: {}", cli.db_path);
 
     match &cli.entity_type {
-        EntityType::Init => db.init(),
-        EntityType::Part(cmd) => part_cmd(&db, cmd),
-        EntityType::Category(cmd) => category_cmd(&db, cmd),
-        EntityType::Export(args) => elebox_core::export(&db, &args.path),
-        EntityType::Import(args) => {
-            let _ = elebox_core::import(&args.path);
-        }
+        EntityType::Init => elebox_core::init(&cli.db_path),
+        EntityType::Part(cmd) => part_cmd(&cli.db_path, cmd),
+        EntityType::Category(cmd) => category_cmd(&cli.db_path, cmd),
+        EntityType::Export(_args) => todo!(),
+        EntityType::Import(_args) => todo!(),
     };
 }

elebox-cli/src/part_cmd.rs

@@ -1,4 +1,5 @@
 use clap::{Args, Subcommand};
+use elebox_core::{Manager, Transferable};
 
 #[derive(Debug, Args)]
 pub struct PartCommand {
@@ -68,12 +69,13 @@ struct DeletePartArgs {
 
 #[derive(Debug, Args)]
 struct CsvPartArgs {
-    #[arg(default_value = "elebox_export_parts.tsv")]
+    #[arg(default_value = "elebox_export_parts.yaml")]
     path: String,
 }
 
-pub fn part_cmd(db: &dyn elebox_core::Database, cmd: &PartCommand) {
-    let manager = elebox_core::PartManager::new(db);
+// pub fn part_cmd(db: &dyn elebox_core::Database, cmd: &PartCommand) {
+pub fn part_cmd(path: &str, cmd: &PartCommand) {
+    let manager = elebox_core::PartManager::new(path);
 
     match &cmd.command {
         Some(sub_cmd) => match sub_cmd {
@@ -90,41 +92,35 @@ pub fn part_cmd(db: &dyn elebox_core::Database, cmd: &PartCommand) {
             }
             PartSubCommand::Delete(args) => {
                 if let Err(err) = manager.delete(&args.name) {
-                    println!("{err}");
+                    println!("ERR: {err}");
                 }
             }
-            PartSubCommand::Update(args) => {
-                // TODO
-                // if let Err(err) = manager.update(
-                //     &args.old_name,
-                //     args.new_name.as_deref(),
-                //     args.new_quantity,
-                //     args.new_part_cat.as_deref(),
-                // ) {
-                //     println!("{err}");
-                // }
+            PartSubCommand::Update(_args) => {
+                todo!();
             }
             PartSubCommand::Add(args) => {
                 if let Err(err) = manager.update_part_quantity(&args.name, args.quantity as i16) {
-                    println!("{err}");
+                    println!("ERR: {err}");
                 }
             }
             PartSubCommand::Use(args) => {
                 let q = args.quantity as i16 * -1;
                 if let Err(err) = manager.update_part_quantity(&args.name, q) {
-                    println!("{err}");
+                    println!("ERR: {err}");
                 }
             }
-            PartSubCommand::Export(args) => {
-                let _ = manager.export(&args.path);
-            }
-            PartSubCommand::Import(args) => {
-                let _ = manager.import(&args.path);
-            }
+            PartSubCommand::Export(args) => match manager.export(&args.path) {
+                Ok(_) => println!("Export success: {}", args.path),
+                Err(_) => println!("Export error: {}", args.path),
+            },
+            PartSubCommand::Import(args) => match manager.import(&args.path) {
+                Ok(_) => println!("Import success: {}", args.path),
+                Err(_) => println!("Import error: {}", args.path),
+            },
         },
         None => {
             println!("List part");
-            let parts = manager.list();
+            let parts = manager.list().unwrap();
             for part in parts {
                 println!("{}   {}   {}", part.name, part.quantity, part.category);
             }

elebox-core/Cargo.toml

@@ -11,7 +11,12 @@ edition = "2021"
 jammdb = "0.11.0"
 serde = { version = "1.0", features = ["derive"] }
 rmp-serde = "1.1.2"
-uuid = { version = "1.5.0", features = ["v7", "fast-rng", "macro-diagnostics"] }
+uuid = { version = "1.5.0", features = [
+    "v4",
+    "v7",
+    "fast-rng",
+    "macro-diagnostics",
+] }
 csv = "1.3.0"
 serde_yaml = "0.9.34"