feat: betterconfig

- load from .env
- load from configurable path

Signed-off-by: Rachel Powers <[email protected]>

Author: Ryex

mcmeta/.env.example

@@ -1,3 +1,11 @@
 MCMETA__BIND_ADDRESS=127.0.0.1:9988
+
 MCMETA__STORAGE_FORMAT__TYPE=json
-MCMETA__STORAGE_FORMAT__META_DIRECTORY=../meta
+MCMETA__STORAGE_FORMAT__META_DIRECTORY=../meta
+
+MCMETA__METADATA__MAX_PARALLEL_FETCH_CONNECTIONS=8
+
+MCMETA__DEBUG_LOG__ENABLE=true
+MCMETA__DEBUG_LOG__PATH=./logs
+MCMETA__DEBUG_LOG__PREFIX=mcmeta.log
+MCMETA__DEBUG_LOG__LEVEL=DEBUG

mcmeta/Cargo.toml

@@ -6,10 +6,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+argparse = "0.2.2"
 axum = "0.6.15"
 clap = "4.2.1"
 config = "0.13.3"
 custom_error = "1.9.2"
+dotenv = "0.15.0"
 futures = "0.3.28"
 git2 = "0.17.0"
 hyper = "0.14.25"
@@ -18,6 +20,7 @@ reqwest = { version = "0.11.16", features = ["json"] }
 serde = { version = "1.0.160", features = ["derive"] }
 serde_json = "1.0.95"
 serde_valid = "0.15.0"
+serde_with = "2.3.2"
 tokio = { version = "1.27.0", features = ["full"] }
 tracing = "0.1.37"
 tracing-appender = "0.2.2"

mcmeta/src/app_config.rs

@@ -22,19 +22,6 @@ pub struct DebugLogConfig {
     pub level: String,
 }
 
-impl DebugLogConfig {
-    pub fn tracing_level(&self) -> tracing::Level {
-        match self.level.to_uppercase().trim() {
-            "TRACE" => tracing::Level::TRACE,
-            "DEBUG" => tracing::Level::DEBUG,
-            "INFO" => tracing::Level::INFO,
-            "WARN" => tracing::Level::WARN,
-            "ERROR" => tracing::Level::ERROR,
-            _ => tracing::Level::ERROR,
-        }
-    }
-}
-
 #[derive(Deserialize, Debug)]
 pub struct ServerConfig {
     pub bind_address: String,
@@ -44,7 +31,7 @@ pub struct ServerConfig {
 }
 
 impl ServerConfig {
-    pub fn from_config() -> Result<Self, MetaMCError> {
+    pub fn from_config(path: &str) -> Result<Self, MetaMCError> {
         let config = config::Config::builder()
             .set_default("bind_address", "127.0.0.1:8080")?
             .set_default("storage_format.type", "json")?
@@ -54,10 +41,9 @@ impl ServerConfig {
             .set_default("debug_log.path", "./logs")?
             .set_default("debug_log.prefix", "mcmeta.log")?
             .set_default("debug_log.level", "debug")?
-            .add_source(config::File::new(
-                "config/settings",
-                config::FileFormat::Json,
-            ))
+            // optionaly oad config from a file. this is optional though
+            .add_source(config::File::from(std::path::Path::new(path)).required(false))
+            // envierment overrides file
             .add_source(config::Environment::with_prefix("mcmeta").separator("__"))
             .build()?;
 

mcmeta/src/main.rs

@@ -1,4 +1,4 @@
-use std::{path::Path as StdPath, sync::Arc};
+use std::{path::Path as StdPath, str::FromStr, sync::Arc};
 
 use app_config::{ServerConfig, StorageFormat};
 use axum::{
@@ -25,7 +25,7 @@ mod storage;
 mod utils;
 
 custom_error! {pub MetaMCError
-    MojangMetadata { source: download::mojang::MojangMetadataError } = "Error while downloading Mojang metadata: {source}",
+    MojangMetadata { source: download::errors::MetadataError } = "Error while downloading metadata: {source}",
     Config { source: config::ConfigError } = "Error while reading config from environment",
     Parse { source: std::net::AddrParseError } = "Error while parsing address: {source}",
     Hyper { source: hyper::Error } = "Error while running Hyper: {source}",
@@ -250,13 +250,31 @@ async fn raw_forge_version_installer(
     }
 }
 
+use argparse::{ArgumentParser, Store};
+use dotenv::dotenv;
 use tracing_subscriber::{filter, prelude::*};
 
 #[tokio::main]
 async fn main() -> Result<(), MetaMCError> {
-    let config = Arc::new(ServerConfig::from_config()?);
+    dotenv().ok(); // This line loads the environment variables from the ".env" file.
 
-    let file_appender = tracing_appender::rolling::hourly(&config.debug_log.path, &config.debug_log.prefix);
+    let mut config_path = "".to_string();
+    {
+        // limit scope of argparse borrows
+        let mut ap = ArgumentParser::new();
+        ap.set_description("A Minecraft metadata api server for Mojang and Modloader metadata.");
+        ap.refer(&mut config_path).add_option(
+            &["-c", "--config"],
+            Store,
+            "Path to a json config file.",
+        );
+        ap.parse_args_or_exit();
+    }
+
+    let config = Arc::new(ServerConfig::from_config(&config_path)?);
+
+    let file_appender =
+        tracing_appender::rolling::hourly(&config.debug_log.path, &config.debug_log.prefix);
     let (non_blocking_file, _guard) = tracing_appender::non_blocking(file_appender);
     let stdout_log = tracing_subscriber::fmt::layer()
         .with_file(true)
@@ -267,7 +285,9 @@ async fn main() -> Result<(), MetaMCError> {
     let debug_log = tracing_subscriber::fmt::layer()
         .with_ansi(false)
         .with_writer(non_blocking_file)
-        .with_filter(filter::LevelFilter::from_level(config.debug_log.tracing_level()));
+        .with_filter(filter::LevelFilter::from_level(
+            tracing::Level::from_str(&config.debug_log.level).unwrap_or(tracing::Level::DEBUG),
+        ));
 
     if config.debug_log.enable {
         tracing_subscriber::registry()