From 96ef1d6a4c5aaf466bf01b1d679e6731b1bf3b4a Mon Sep 17 00:00:00 2001 From: George Kaklamanos Date: Mon, 20 Nov 2023 21:08:08 +0200 Subject: [PATCH] main: Use the new CSV struct and ACL trait --- labadoor/Cargo.toml | 1 + labadoor/src/main.rs | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/labadoor/Cargo.toml b/labadoor/Cargo.toml index 0e7dc93..e3ec851 100644 --- a/labadoor/Cargo.toml +++ b/labadoor/Cargo.toml @@ -9,6 +9,7 @@ labadoor-telegram = { path = "../labadoor-telegram", optional = true } labadoor-matrix = { path = "../labadoor-matrix", optional = true } labadoor-csv = { path = "../labadoor-csv", optional = true } labadoor-gpio = { path = "../labadoor-gpio", optional = true } +labadoor-acl = { path = "../labadoor-acl" } serde = { version = "1.0.164", features = ["derive"] } config = "0.13.3" diff --git a/labadoor/src/main.rs b/labadoor/src/main.rs index 78f6892..ef4c5d0 100644 --- a/labadoor/src/main.rs +++ b/labadoor/src/main.rs @@ -1,3 +1,4 @@ +use labadoor_acl::ACL; mod cli; fn main() { @@ -25,12 +26,10 @@ fn main() { #[cfg(feature = "csv")] cli::Command::CSV(_) => { let csv = config.get::("csv").unwrap(); - labadoor_csv::csv( - csv.path.unwrap(), - csv.method.unwrap(), - csv.identifier.unwrap(), - csv.resource_shortcut.unwrap(), - ); + let c = labadoor_csv::CSV { + path: csv.path.unwrap(), + }; + c.auth_user(csv.method, csv.identifier, csv.resource_shortcut); } #[cfg(feature = "gpio")] cli::Command::GPIO(_) => {