made utils mod a directory

src/branches.rs

@@ -1,10 +1,12 @@
 //This file will handles all the logic to create a new branch
 
-use crate::utils::read_vault_ignore;
-use crate::utils::sync_current_dir;
+
 use std::fs;
 use std::io::{self};
 use std::path::Path;
+use crate::utils::utils:: read_vault_ignore;
+use crate::utils::sync_dir::sync_current_dir;
+
 
 //Creates a new branch :)
 //@TODO - Add all current components to the new branch

src/utils/dir_structure.rs

@@ -0,0 +1,46 @@
+use std::collections::HashMap;
+use std::fs;
+use std::path::Path;
+
+pub fn get_directory_structure(
+    directory_path: &str,
+) -> HashMap<String, Vec<HashMap<String, String>>> {
+    let path: &Path = Path::new(directory_path);
+
+    if path.is_dir() {
+        let mut result: HashMap<String, Vec<HashMap<String, String>>> = HashMap::new();
+        let mut files: Vec<HashMap<String, String>> = Vec::new();
+
+        if let Ok(entries) = fs::read_dir(path) {
+            for entry in entries {
+                if let Ok(entry) = entry {
+                    let file_name: String = entry.file_name().to_string_lossy().into_owned();
+                    let file_path: std::path::PathBuf = entry.path();
+
+                    let is_directory: bool = file_path.is_dir();
+
+                    let mut file_info: HashMap<String, String> = HashMap::new();
+                    file_info.insert("name".to_string(), file_name.clone());
+                    file_info.insert("is_directory".to_string(), is_directory.to_string());
+                    file_info.insert("is_read".to_string(), "false".to_string());
+
+                    if is_directory {
+                        let subdirectory_structure: HashMap<String, Vec<HashMap<String, String>>> =
+                            get_directory_structure(&file_path.to_string_lossy());
+                        file_info.insert(
+                            "contents".to_string(),
+                            serde_json::to_string(&subdirectory_structure).unwrap(),
+                        );
+                    }
+
+                    files.push(file_info);
+                }
+            }
+        }
+
+        result.insert("contents".to_string(), files);
+        result
+    } else {
+        HashMap::new()
+    }
+}

src/utils/mod.rs

@@ -0,0 +1,3 @@
+pub mod utils;
+pub mod sync_dir;
+pub mod dir_structure;

src/utils.rs → src/utils/sync_dir.rs

@@ -1,11 +1,12 @@
-use std::collections::HashMap;
-use std::fs;
-use std::fs::read_to_string;
 use std::fs::File;
 use std::io::Read;
 use std::io::{self};
+use std::fs;
 use std::path::Path;
 
+use crate::utils::utils::read_vault_ignore;
+
+
 pub fn sync_current_dir(current_dir: &Path, current_branch: &str) -> io::Result<()> {
     let ignored_files: Vec<String> = read_vault_ignore();
     let vault_path: &Path = Path::new(".vault");
@@ -53,59 +54,4 @@ pub fn sync_current_dir(current_dir: &Path, current_branch: &str) -> io::Result<
         }
     }
     Ok(())
-}
-
-pub fn read_vault_ignore() -> Vec<String> {
-    let filename: &str = ".vaultignore";
-    let path: &Path = Path::new(filename);
-    let mut result: Vec<String> = Vec::new();
-    if path.exists() {
-        for line in read_to_string(filename).unwrap().lines() {
-            result.push(line.to_string())
-        }
-    }
-    result
-}
-
-pub fn get_directory_structure(
-    directory_path: &str,
-) -> HashMap<String, Vec<HashMap<String, String>>> {
-    let path: &Path = Path::new(directory_path);
-
-    if path.is_dir() {
-        let mut result: HashMap<String, Vec<HashMap<String, String>>> = HashMap::new();
-        let mut files: Vec<HashMap<String, String>> = Vec::new();
-
-        if let Ok(entries) = fs::read_dir(path) {
-            for entry in entries {
-                if let Ok(entry) = entry {
-                    let file_name: String = entry.file_name().to_string_lossy().into_owned();
-                    let file_path: std::path::PathBuf = entry.path();
-
-                    let is_directory: bool = file_path.is_dir();
-
-                    let mut file_info: HashMap<String, String> = HashMap::new();
-                    file_info.insert("name".to_string(), file_name.clone());
-                    file_info.insert("is_directory".to_string(), is_directory.to_string());
-                    file_info.insert("is_read".to_string(), "false".to_string());
-
-                    if is_directory {
-                        let subdirectory_structure: HashMap<String, Vec<HashMap<String, String>>> =
-                            get_directory_structure(&file_path.to_string_lossy());
-                        file_info.insert(
-                            "contents".to_string(),
-                            serde_json::to_string(&subdirectory_structure).unwrap(),
-                        );
-                    }
-
-                    files.push(file_info);
-                }
-            }
-        }
-
-        result.insert("contents".to_string(), files);
-        result
-    } else {
-        HashMap::new()
-    }
-}
+}

src/utils/utils.rs

@@ -0,0 +1,15 @@
+use std::fs::read_to_string;
+use std::path::Path;
+
+
+pub fn read_vault_ignore() -> Vec<String> {
+    let filename: &str = ".vaultignore";
+    let path: &Path = Path::new(filename);
+    let mut result: Vec<String> = Vec::new();
+    if path.exists() {
+        for line in read_to_string(filename).unwrap().lines() {
+            result.push(line.to_string())
+        }
+    }
+    result
+}