Loading Logging etc

src/util/chats_util.rs

@@ -1,93 +1,65 @@
-use std::string::String;
-use json::{self, array, JsonValue};
-use std::fs::{self, File};
-use std::io::{Read, Write};
-use std::path::Path;
 use axum::Json;
+use json::{self, JsonValue, array};
+use std::path::Path;
+use std::string::String;
 use uuid::Uuid;
 
-use crate::users::contact;
 use crate::users::contact::Contact;
-// assuming you have a Contact struct in a module
+use crate::util::file_util::{load_file, save_file};
 
-pub struct ChatsUtil;
+pub fn mod_user(storage_owner: Uuid, contact: &Contact) {
+    let dir: &str = &format!("users/{}/contacts/", storage_owner);
+    let s = load_file(dir, "contacts.json");
 
-impl ChatsUtil {
-    fn load_file(dir: &str, file_name: &str) -> String {
-        let path = Path::new(dir).join(file_name);
-        if let Ok(mut f) = File::open(&path) {
-            let mut content = String::new();
-            let _ = f.read_to_string(&mut content);
-            content
-        } else {
-            String::new()
+    let mut contacts = if !s.is_empty() {
+        json::parse(&s).unwrap_or(array![])
+    } else {
+        array![]
+    };
+
+    for i in 0..contacts.len() {
+        if contacts[i]["userID"].as_str() == Some(&contact.user_id.unwrap().to_string()) {
+            contacts.remove(stringify!("{}", i));
+            break;
         }
     }
 
-    fn save_file(dir: &str, file_name: &str, content: &str) -> std::io::Result<()> {
-        fs::create_dir_all(dir)?;
-        let path = Path::new(dir).join(file_name);
-        let mut file = File::create(path)?;
-        file.write_all(content.as_bytes())
+    contacts.push(contact.to_json()).unwrap();
+    save_file(&dir, "contacts.json", &contacts.dump());
+}
+
+pub fn get_user(storage_owner: Uuid, user_id: Uuid) -> Option<Contact> {
+    let dir = format!("users/{}/contacts/", storage_owner);
+    let s = load_file(&dir, "contacts.json");
+    if s.is_empty() {
+        return None;
     }
 
-    pub fn mod_user(storage_owner: Uuid, contact: &Contact){
-        let dir = format!("users/{}/contacts/", storage_owner);
-        let file_name = "contacts.json";
-        let s = Self::load_file(&dir, file_name);
-
-        let mut contacts = if !s.is_empty() {
-            json::parse(&s).unwrap_or(array![])
-        } else {
-            array![]
-        };
-
+    if let Ok(contacts) = json::parse(&s) {
         for i in 0..contacts.len() {
-            if contacts[i]["userID"].as_str() == Some(&contact.user_id.unwrap().to_string()) {
-                contacts.remove(stringify!("{}", i));
-                break;
+            if let Some(uid) = contacts[i]["userID"].as_str() {
+                if Uuid::parse_str(uid).ok()? == user_id {
+                    return Option::from(Contact::from_json(&contacts[i]));
+                }
             }
         }
-
-        contacts.push(contact.to_json()).unwrap();
-        Self::save_file(&dir, file_name, &contacts.dump());
     }
+    None
+}
 
-    pub fn get_user(storage_owner: Uuid, user_id: Uuid) -> Option<Contact> {
-        let dir = format!("users/{}/contacts/", storage_owner);
-        let file_name = "contacts.json";
-        let s = Self::load_file(&dir, file_name);
-        if s.is_empty() {
-            return None;
-        }
+pub fn get_users(storage_owner: Uuid) -> JsonValue {
+    let dir: &str = &format!("users/{}/contacts/", storage_owner);
+    let s = load_file(dir, "contacts.json");
 
+    let mut contacts_out = array![];
+    if !s.is_empty() {
         if let Ok(contacts) = json::parse(&s) {
             for i in 0..contacts.len() {
-                if let Some(uid) = contacts[i]["userID"].as_str() {
-                    if Uuid::parse_str(uid).ok()? == user_id {
-                        return Option::from(Contact::from_json(&contacts[i]));
-                    }
-                }
+                let c = Contact::from_json(&contacts[i]);
+                contacts_out.push(c.to_json()).unwrap();
             }
         }
-        None
     }
 
-    pub fn get_users(storage_owner: Uuid) -> JsonValue {
-        let dir = format!("/users/{}/contacts/", storage_owner);
-        let file_name = "contacts.json";
-        let s = Self::load_file(&dir, file_name);
-
-        let mut contacts_out = array![];
-        if !s.is_empty() {
-            if let Ok(contacts) = json::parse(&s) {
-                for i in 0..contacts.len() {
-                    let c = Contact::from_json(&contacts[i]);
-                    contacts_out.push(c.to_json()).unwrap();
-                }
-            }
-        }
-
-        contacts_out
-    }
-}
+    contacts_out
+}

src/util/config_util.rs

@@ -1,9 +1,8 @@
+use crate::util::file_util::{load_file, save_file};
 use json::JsonValue;
 use std::fs::{self, File};
-use std::io::{Read, Write};
 use std::path::Path;
 use uuid::Uuid;
-use crate::util::file_util::{load_file, save_file};
 
 pub struct ConfigUtil {
     pub config: JsonValue,
@@ -37,6 +36,6 @@ impl ConfigUtil {
     }
 
     pub fn save(&self) {
-        save_file("","config.json", &self.config.to_string());
+        save_file("", "config.json", &self.config.to_string());
     }
 }

src/util/file_util.rs

@@ -1,13 +1,14 @@
-use sysinfo::{System};
+use std::ffi::OsStr;
+use std::fmt::Write as FmtWrite;
 use std::fs::{self, File};
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
-use std::time::SystemTime;
-use std::ffi::OsStr;
 use std::process;
-use walkdir::WalkDir;
-use std::fmt::Write as FmtWrite;
+use std::time::SystemTime;
+use sysinfo::System;
 use uuid::Uuid;
+use walkdir::WalkDir;
+
 pub fn delete_file(path: &str, name: &str) -> bool {
     let dir = Path::new(&get_directory()).join(path);
     let file = dir.join(name);
@@ -27,7 +28,11 @@ fn delete_dir_recursive(directory: &Path) -> bool {
         return false;
     }
     if let Err(e) = fs::remove_dir_all(directory) {
-        println!("[IMPORTANT] Couldn't delete directory {}: {}", directory.display(), e);
+        println!(
+            "[IMPORTANT] Couldn't delete directory {}: {}",
+            directory.display(),
+            e
+        );
         return false;
     }
     true
@@ -78,7 +83,11 @@ pub fn save_file(path: &str, name: &str, value: &str) {
     }
 
     if let Err(e) = fs::write(&file_path, value) {
-        println!("[IMPORTANT] Couldn't write file {}: {}", file_path.display(), e);
+        println!(
+            "[IMPORTANT] Couldn't write file {}: {}",
+            file_path.display(),
+            e
+        );
     }
 }
 
@@ -100,10 +109,7 @@ pub fn get_directory_size(directory: &Path) -> u64 {
         let path = entry.path();
         if path.is_file() {
             if let Ok(metadata) = path.metadata() {
-                size += path
-                    .file_name()
-                    .unwrap_or(OsStr::new(""))
-                    .len() as u64;
+                size += path.file_name().unwrap_or(OsStr::new("")).len() as u64;
                 size += metadata.len();
             }
         }
@@ -142,9 +148,5 @@ pub fn get_used_ram() -> String {
     sys.refresh_all();
     let used = sys.used_memory() * 1024; // kB to bytes
     let total = sys.total_memory() * 1024;
-    format!(
-        "{}/{}",
-        design_byte(used),
-        design_byte(total)
-    )
+    format!("{}/{}", design_byte(used), design_byte(total))
 }