From 98d4c72f7f452aabf5aaf85a6e81f0df95de24f6 Mon Sep 17 00:00:00 2001
From: Dietrich <dietrich@teilgedanken.de>
Date: Fri, 23 Oct 2020 15:17:57 +0200
Subject: [PATCH] properly do read_all

---
 src/bin/read_all.rs | 29 +++++------------------------
 src/lib.rs          |  2 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/bin/read_all.rs b/src/bin/read_all.rs
index a08b2d4..ac02dc1 100644
--- a/src/bin/read_all.rs
+++ b/src/bin/read_all.rs
@@ -1,11 +1,5 @@
 extern crate adduser;
 
-use adduser::NewFromString;
-use adduser::Shadow;
-use adduser::User;
-use std::fs::File;
-use std::io::{prelude::*, BufReader};
-
 fn main() {
     simplelog::CombinedLogger::init(vec![simplelog::TermLogger::new(
         simplelog::LevelFilter::Warn,
@@ -13,24 +7,11 @@ fn main() {
         simplelog::TerminalMode::Mixed,
     )])
     .unwrap();
-    let file: File = File::open("/etc/passwd").unwrap();
-    let reader: BufReader<File> = BufReader::new(file);
+    use adduser::api::UserDBRead;
 
-    for line in reader.lines() {
-        let line: String = line.unwrap();
-        println!("{}", User::new_from_string(line).unwrap());
+    let db = adduser::UserDBLocal::load_files(adduser::Files::default());
+
+    for u in db.get_all_users() {
+        println!("{}", u);
     }
-
-    let line = "test:!!$6$/RotIe4VZzzAun4W$7YUONvru1rDnllN5TvrnOMsWUD5wSDUPAD6t6/Xwsr/0QOuWF3HcfAhypRkGa8G1B9qqWV5kZSnCb8GKMN9N61:18260:0:99999:7:::".to_string();
-    assert_eq!(
-        format!("{}", Shadow::new_from_string(line.clone()).unwrap()),
-        line
-    );
-
-    // let pwd = User::default();
-    // let pwd2 =
-    //     User::new_from_string("howdy:notencrypted:1001:1001:not done:/home/test:/bin/bash");
-    // println!("Test struct: {}", pwd);
-
-    // assert_eq!(pwd, pwd2.unwrap())
 }
diff --git a/src/lib.rs b/src/lib.rs
index a451ea8..85d3dc5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,5 +15,5 @@ pub use user::passwd_fields::{
 };
 pub use user::shadow_fields::Shadow;
 pub use user::User;
-pub use userlib::NewFromString;
+pub use userlib::{Files, NewFromString, UserDBLocal};
 pub use userlib_error::UserLibError;