adds tests for config

src/config.rs

@@ -85,30 +85,16 @@ pub struct Config
     pub api_token: String
 }
 
-#[derive(Clone)]
-pub struct AppState
+pub fn read_config(path: &str) -> Option<Config>
 {
-
-}
-
-impl AppState
-{
-    pub fn new() -> AppState
-    {
-        AppState {}
-    } 
-}
-
-pub fn read_config() -> Option<Config>
-{
-    if Path::new(CONFIG_PATH).exists()
+    if Path::new(&path).exists()
     {
-        let data = match read_file_utf8(CONFIG_PATH)
+        let data = match read_file_utf8(&path)
         {
             Some(d) => d,
             None =>
             {
-                println!("Error reading configuration file {} no data", CONFIG_PATH);
+                crate::debug(format!("Error reading configuration file {} no data", path), None);
                 return None
             }
         };
@@ -118,7 +104,7 @@ pub fn read_config() -> Option<Config>
             Ok(data) => {data},
             Err(why) => 
             {
-                println!("Error reading configuration file {}\n{}", CONFIG_PATH, why);
+                crate::debug(format!("Error reading configuration file {}\n{}", path, why), None);
                 return None
             }
         };
@@ -127,7 +113,7 @@ pub fn read_config() -> Option<Config>
     }
     else 
     {
-        println!("Error configuration file {} does not exist", CONFIG_PATH);
+        crate::debug(format!("Error configuration file {} does not exist", path), None);
         None
     }
 }

src/content/sitemap.rs

@@ -7,7 +7,7 @@ use chrono::{DateTime, Datelike, Utc};
 use indicatif::ProgressBar;
 use quick_xml::{events::{BytesText, Event}, Error, Writer};
 use regex::Regex;
-use crate::{config::read_config, content::{filter::ContentFilter, HasUir}, filesystem::file::{write_file_bytes, File, Observed}, util::format_elapsed};
+use crate::{config::{read_config, CONFIG_PATH}, content::{filter::ContentFilter, HasUir}, filesystem::file::{write_file_bytes, File, Observed}, util::format_elapsed};
 
 use crate::server::https::parse_uri;
 
@@ -344,7 +344,7 @@ impl Into<Router> for SiteMap
 {
     fn into(self) -> Router
     {
-        let static_router = match read_config()
+        let static_router = match read_config(CONFIG_PATH)
         {
             Some(config) =>
             {

src/server/api/stats.rs

@@ -6,7 +6,7 @@ use reqwest::StatusCode;
 use serde::Deserialize;
 use tokio::sync::Mutex;
 
-use crate::{config::read_config, web::{discord::request::post::post, is_authentic, stats::{self, Stats}}};
+use crate::{config::{read_config, CONFIG_PATH}, web::{discord::request::post::post, is_authentic, stats::{self, Stats}}};
 
 use super::ApiRequest;
 
@@ -51,7 +51,7 @@ impl ApiRequest for StatsDigest
     fn is_authentic(headers: HeaderMap, body: Bytes) -> StatusCode
     {
 
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>
@@ -98,7 +98,7 @@ impl ApiRequest for StatsDigest
 
     async fn into_response(&self, stats: Option<Stats>) -> (Option<String>, StatusCode)
     {
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>

src/server/http.rs

@@ -1,6 +1,6 @@
 use crate::
 {
-    config::read_config, web::throttle::{handle_throttle, IpThrottler}
+    config::{read_config, CONFIG_PATH}, web::throttle::{handle_throttle, IpThrottler}
 };
 
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
@@ -45,7 +45,7 @@ impl ServerHttp
     -> ServerHttp
     {
 
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>

src/server/https.rs

@@ -1,6 +1,6 @@
 use crate::
 {
-    config::{read_config, Config}, content::{filter::ContentFilter, sitemap::SiteMap, Content}, web::{stats::{log_stats, Digest, Stats}, 
+    config::{read_config, Config, CONFIG_PATH}, content::{filter::ContentFilter, sitemap::SiteMap, Content}, web::{stats::{log_stats, Digest, Stats}, 
     throttle::{handle_throttle, IpThrottler}}, CRAB
 };
 
@@ -67,7 +67,7 @@ impl Server
     -> Server
     {
 
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>

src/web/stats.rs

@@ -18,7 +18,7 @@ use axum::
     middleware::Next
 };
 
-use crate::config::read_config;
+use crate::config::{read_config, CONFIG_PATH};
 use crate::content::is_page;
 use crate::
 {
@@ -91,7 +91,7 @@ impl Stats
     {
         let start_time = Instant::now();
 
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>
@@ -191,7 +191,7 @@ impl Stats
             None => 3
         };
 
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>
@@ -387,7 +387,7 @@ impl Stats
 
     pub fn save(stats: &mut MutexGuard<'_, Stats>)
     {
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>
@@ -432,7 +432,7 @@ impl Stats
 
     pub fn archive()
     {
-        let config = match read_config()
+        let config = match read_config(CONFIG_PATH)
         {
             Some(c) => c,
             None =>
@@ -546,7 +546,7 @@ impl Stats
             {
                 let mut stats = state.lock().await;
 
-                let config = match read_config()
+                let config = match read_config(CONFIG_PATH)
                 {
                     Some(c) => c,
                     None =>

tests/test_config.rs

@@ -0,0 +1,55 @@
+mod common;
+
+#[cfg(test)]
+mod config
+{
+    use busser::config::read_config;
+
+    #[test]
+    fn test_read_config()
+    {
+        let config_option = read_config("tests/config.json");
+
+        assert!(config_option.is_some());
+
+        let config = config_option.unwrap();
+
+        assert_eq!(config.port_https, 443);
+        assert_eq!(config.port_http, 80);
+        assert_eq!(config.domain, "127.0.0.1");
+        assert_eq!(config.api_token, "some_secure_secret_token");
+        assert_eq!(config.notification_endpoint.get_addr(), "https://discord.com/api/webhooks/abc/xyz");
+        assert_eq!(config.cert_path, "certs/cert.pem");
+        assert_eq!(config.key_path, "certs/key.pem");
+
+        assert_eq!(config.throttle.max_requests_per_second, 64.0);
+        assert_eq!(config.throttle.timeout_millis, 5000);
+        assert_eq!(config.throttle.clear_period_seconds, 3600);
+
+        assert_eq!(config.stats.save_period_seconds, 10);
+        assert_eq!(config.stats.path, "stats");
+        assert_eq!(config.stats.hit_cooloff_seconds, 60);
+        assert_eq!(config.stats.digest_period_seconds, 86400);
+        assert_eq!(config.stats.log_files_clear_period_seconds, 2419200);
+        assert_eq!(config.stats.ignore_regexes.unwrap(), vec!["/favicon.ico".to_string()]);
+
+        assert_eq!(config.content.path, "/home/jerboa/Website/");
+        assert_eq!(config.content.home, "/home/jerboa/Website/jerboa.html");
+        assert_eq!(config.content.allow_without_extension, true);
+        assert_eq!(config.content.browser_cache_period_seconds, 3600);
+        assert_eq!(config.content.server_cache_period_seconds, 1);
+        assert_eq!(config.content.ignore_regexes.unwrap(), vec!["/.git", "workspace"]);
+    }
+
+    #[test]
+    fn test_config_error()
+    {
+        let missing_config = read_config("not_a_config");
+
+        assert!(missing_config.is_none());
+
+        let not_a_config = read_config("test/pages/b.html");
+
+        assert!(not_a_config.is_none());
+    }
+}