LibreTunes/LibreTunes-DX
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move load_config to Config::from_env

Browse Source
This commit is contained in:
Ethan Girouard
2026-07-19 10:00:07 -04:00
parent a0931eb420
commit b15b8b2ae1
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/server/config.rs
View File

@@ -201,32 +201,34 @@ pub struct Config {
pub server: ServerConfig, pub server: ServerConfig,
} }
/// Parse configuration from the expected files and environment variables impl Config {
pub fn load_config() -> Result<Config, config::ConfigError> { /// Parse configuration from the expected files and environment variables
use config::{Environment, File}; pub fn from_env() -> Result<Self, config::ConfigError> {
use config::{Environment, File};
let pkg_name = env!("CARGO_PKG_NAME"); let pkg_name = env!("CARGO_PKG_NAME");
config::Config::builder() config::Config::builder()
.set_default( .set_default(
"server.port", "server.port",
dioxus::cli_config::server_port().unwrap_or(8080), dioxus::cli_config::server_port().unwrap_or(8080),
)? )?
.set_default( .set_default(
"server.host", "server.host",
dioxus::cli_config::server_ip() dioxus::cli_config::server_ip()
.unwrap_or(IpAddr::V4(Ipv4Addr::UNSPECIFIED)) .unwrap_or(IpAddr::V4(Ipv4Addr::UNSPECIFIED))
.to_string(), .to_string(),
)? )?
.set_default("auth.open_signup", false)? .set_default("auth.open_signup", false)?
.set_default("auth.cookies_secure", DEFAULT_COOKIES_SECURE)? .set_default("auth.cookies_secure", DEFAULT_COOKIES_SECURE)?
.set_default("server.public_path", default_public_dir())? .set_default("server.public_path", default_public_dir())?
.add_source(File::with_name(&format!("/etc/{pkg_name}/config")).required(false)) .add_source(File::with_name(&format!("/etc/{pkg_name}/config")).required(false))
.add_source(File::with_name(&format!("/etc/{pkg_name}")).required(false)) .add_source(File::with_name(&format!("/etc/{pkg_name}")).required(false))
.add_source(File::with_name("config").required(false)) .add_source(File::with_name("config").required(false))
.add_source(Environment::with_prefix(pkg_name).separator("_")) .add_source(Environment::with_prefix(pkg_name).separator("_"))
.build()? .build()?
.try_deserialize() .try_deserialize()
}
} }
/// Provide a sane default for the public path, using the same sources as Dioxus does internally. /// Provide a sane default for the public path, using the same sources as Dioxus does internally.

4
src/server/main.rs
View File

@@ -10,7 +10,7 @@ use tower_http::services::ServeFile;
use crate::App; use crate::App;
use crate::app::LOGO_ICO; use crate::app::LOGO_ICO;
use crate::server::{ use crate::server::{
auth::build_auth_layer, config, database, key_val_store, auth::build_auth_layer, config::Config, database, key_val_store,
require_auth_mw::require_auth_middleware, require_auth_mw::require_auth_middleware,
}; };
use crate::util::error::{Contextualize, Error, ErrorType, Result}; use crate::util::error::{Contextualize, Error, ErrorType, Result};
@@ -21,7 +21,7 @@ pub async fn main() -> Result<std::convert::Infallible> {
} }
tracing::debug!("Loading configuration..."); tracing::debug!("Loading configuration...");
let config = config::load_config() let config = Config::from_env()
.map_err(|e| Error::message_here(e.to_string())) .map_err(|e| Error::message_here(e.to_string()))
.err_context("Failed to load config")?; .err_context("Failed to load config")?;