Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
191 changes: 189 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion crates/horismos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@ name = "horismos"
version.workspace = true
edition.workspace = true
license.workspace = true
description = "Configuration — Harmonia subsystem config loader"
description = "Configuration loading and validation for Harmonia"

[dependencies]
harmonia-common.workspace = true
figment = { workspace = true, features = ["toml", "env"] }
serde.workspace = true
snafu.workspace = true
tracing.workspace = true

[dev-dependencies]
rstest.workspace = true
tempfile = "3"
serde_json.workspace = true
figment = { workspace = true, features = ["toml", "env", "test"] }
32 changes: 32 additions & 0 deletions crates/horismos/src/config.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
use serde::{Deserialize, Serialize};

use crate::subsystems::{
AggeliaConfig, DatabaseConfig, EpignosisConfig, ErgasiaConfig, ExousiaConfig, KritikeConfig,
ParocheConfig, ProsthekeConfig, SyntaxisConfig, TaxisConfig, ZetesisConfig,
};

#[derive(Debug, Clone, Default, Serialize, Deserialize)]
pub struct Config {
#[serde(default)]
pub database: DatabaseConfig,
#[serde(default)]
pub exousia: ExousiaConfig,
#[serde(default)]
pub paroche: ParocheConfig,
#[serde(default)]
pub taxis: TaxisConfig,
#[serde(default)]
pub epignosis: EpignosisConfig,
#[serde(default)]
pub kritike: KritikeConfig,
#[serde(default)]
pub aggelia: AggeliaConfig,
#[serde(default)]
pub zetesis: ZetesisConfig,
#[serde(default)]
pub ergasia: ErgasiaConfig,
#[serde(default)]
pub syntaxis: SyntaxisConfig,
#[serde(default)]
pub prostheke: ProsthekeConfig,
}
20 changes: 20 additions & 0 deletions crates/horismos/src/error.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
use snafu::Snafu;

#[derive(Debug, Snafu)]
#[snafu(visibility(pub(crate)))]
pub enum HorismosError {
#[snafu(display("configuration parse error: {source}"))]
ConfigParse {
#[snafu(source(from(figment::Error, Box::new)))]
source: Box<figment::Error>,
#[snafu(implicit)]
location: snafu::Location,
},

#[snafu(display("configuration validation failed: {message}"))]
Validation {
message: String,
#[snafu(implicit)]
location: snafu::Location,
},
}
Loading
Loading