move file and folder io to new modules

src/config.rs

@@ -2,7 +2,7 @@ use std::path::Path;
 
 use serde::{Serialize, Deserialize};
 
-use crate::{util::read_file_utf8, web::discord::request::model::Webhook};
+use crate::{filesystem::file::read_file_utf8, web::discord::request::model::Webhook};
 
 /// Configure the stats collection
 /// - ```save_period_seconds```: periodically save to disc

src/filesystem/file.rs

@@ -0,0 +1,51 @@
+use std::{fs::File, io::{Read, Write}};
+
+pub fn write_file(path: &str, data: &[u8])
+{
+    let mut file = File::create(path).unwrap();
+    file.write_all(data).unwrap();
+}
+
+pub fn read_file_utf8(path: &str) -> Option<String>
+{
+    let mut file = match File::open(path) {
+        Err(why) => 
+        {
+            crate::debug(format!("error reading file to utf8, {}", why), None);
+            return None
+        },
+        Ok(file) => file,
+    };
+
+    let mut s = String::new();
+    match file.read_to_string(&mut s) {
+        Err(why) => 
+        {
+            crate::debug(format!("error reading file to utf8, {}", why), None);
+            None
+        },
+        Ok(_) => Some(s)
+    }
+}
+
+pub fn read_file_bytes(path: &str) -> Option<Vec<u8>>
+{
+    let mut file = match File::open(path) {
+        Err(why) => 
+        {
+            crate::debug(format!("error reading file to utf8, {}", why), None);
+            return None
+        },
+        Ok(file) => file,
+    };
+
+    let mut s: Vec<u8> = vec![];
+    match file.read_to_end(&mut s) {
+        Err(why) => 
+        {
+            crate::debug(format!("error reading file to utf8, {}", why), None);
+            None
+        },
+        Ok(_) => Some(s)
+    }
+}

src/filesystem/folder.rs

@@ -0,0 +1,151 @@
+use core::fmt;
+use std::fs::DirEntry;
+
+use regex::Regex;
+
+#[derive(Debug, Clone)]
+pub struct ListDirError
+{
+    pub why: String
+}
+
+impl fmt::Display for ListDirError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.why)
+    }
+}
+
+pub fn list_dir(path: String) -> Result<std::fs::ReadDir, ListDirError>
+{
+    match std::fs::read_dir(path)
+    {
+        Ok(files) => 
+        {
+            Ok(files)
+        },
+        Err(why) => 
+        {
+            Err(ListDirError { why: format!("{}", why)})
+        }
+    }
+}
+
+pub fn dir_entry_to_path(d: DirEntry) -> Option<String>
+{
+    let file_os_string = d.file_name();
+
+    match file_os_string.to_str()
+    {
+        Some(name) => Some(name.to_string()),
+        None =>
+        {
+            crate::debug(format!("could not load file name: {:?}", file_os_string), None);
+            None
+        }
+    }
+}
+
+pub fn list_sub_dirs(path: String) -> Vec<String>
+{
+    let mut found_dirs: Vec<String> = vec![];
+    match std::fs::read_dir(path.clone())
+    {
+        Ok(files) => 
+        {
+
+            for file in files
+            {
+                let name = match file
+                {
+                    Ok(d) => dir_entry_to_path(d),
+                    Err(e) =>
+                    {
+                        crate::debug(format!("could not load file name: {}", e), None);
+                        continue
+                    }
+                };
+
+                match name 
+                {
+                    Some(n) =>
+                    {
+                        let p = path.clone()+"/"+&n;
+                        match std::fs::metadata(p.clone())
+                        {
+                            Ok(md) =>
+                            {
+                                match md.is_dir()
+                                {
+                                    true => {found_dirs.push(p.clone()); crate::debug(format!("found folder: {}", p), None)},
+                                    false => {continue}
+                                }
+                            },
+                            Err(e) =>
+                            {
+                                crate::debug(format!("error getting file: {}", e), None);
+                                continue
+                            }
+                        }
+                    },
+                    None => continue
+                }
+            } 
+        },
+        Err(why) => 
+        {
+            crate::debug(format!("Error reading dir {}\n {}", path, why), None); 
+        }
+    }
+
+    found_dirs
+}
+
+pub fn list_dir_by(pattern: Option<Regex>, path: String) -> Vec<String>
+{
+    match std::fs::read_dir(path.clone())
+    {
+        Ok(files) => 
+        {
+            let mut found_files: Vec<String> = vec![];
+            for file in files 
+            {
+
+                let file_name = match file
+                {
+                    Ok(d) => dir_entry_to_path(d),
+                    Err(e) =>
+                    {
+                        crate::debug(format!("could not load file name: {}", e), None);
+                        continue
+                    }
+                };
+
+                let file_path = match file_name
+                {
+                    Some(name) => path.clone() + "/" + &name,
+                    None => continue
+                };
+
+                if pattern.clone().is_some()
+                {
+                    match pattern.clone().unwrap().captures(&file_path)
+                    {
+                        Some(_caps) => {found_files.push(file_path.to_string())},
+                        None => {continue}
+                    }
+                }
+                else
+                {
+                    found_files.push(file_path.to_string())
+                }
+            }
+
+            return found_files
+        },
+        Err(why) => 
+        {
+            crate::debug(format!("Error reading dir {}\n {}", path, why), None); 
+        }
+    }
+    vec![]
+}

src/filesystem/mod.rs

@@ -0,0 +1,2 @@
+pub mod file;
+pub mod folder;

src/lib.rs

@@ -6,6 +6,7 @@ pub mod util;
 pub mod pages;
 pub mod resources;
 pub mod config;
+pub mod filesystem;
 
 const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR");
 const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");

src/pages/mod.rs

@@ -1,7 +1,6 @@
 use regex::Regex;
 
-use crate::{util::{list_dir_by, list_sub_dirs, read_file_utf8}, HTML_REGEX};
-
+use crate::{filesystem::folder::{list_dir_by, list_sub_dirs}, HTML_REGEX, filesystem::file::read_file_utf8};
 use self::page::Page;
 
 pub mod page;

src/pages/page.rs

@@ -4,7 +4,7 @@ use axum::response::{IntoResponse, Response, Html};
 use regex::Regex;
 use serde::{Serialize, Deserialize};
 
-use crate::util::read_file_utf8;
+use crate::filesystem::file::read_file_utf8;
 
 /// An HTML webpage with a uri and body
 /// 

src/resources/mod.rs

@@ -2,7 +2,7 @@ pub mod resource;
 
 use regex::Regex;
 
-use crate::{util::{list_dir_by, list_sub_dirs, read_file_bytes}, HTML_REGEX, RESOURCE_REGEX};
+use crate::{filesystem::folder::{list_dir_by, list_sub_dirs}, HTML_REGEX, RESOURCE_REGEX, filesystem::file::read_file_bytes};
 
 use self::resource::{content_type, Resource};