diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-10-03 09:31:05 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-10-03 09:31:05 +0200 |
| commit | fffc7a3b8a8a3ead3992d400ec9ed035f1f93b39 (patch) | |
| tree | 44b7827eeda1ef5a0a9012873a78ba401f7027d1 /base | |
| parent | 1fff4e3828ca0745aaed3d778dcd47f1dfa79cd3 (diff) | |
| download | jellything-fffc7a3b8a8a3ead3992d400ec9ed035f1f93b39.tar jellything-fffc7a3b8a8a3ead3992d400ec9ed035f1f93b39.tar.bz2 jellything-fffc7a3b8a8a3ead3992d400ec9ed035f1f93b39.tar.zst | |
use yaml for configuration
Diffstat (limited to 'base')
| -rw-r--r-- | base/Cargo.toml | 2 | ||||
| -rw-r--r-- | base/src/lib.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/base/Cargo.toml b/base/Cargo.toml index 03b5055..45c3843 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] jellycommon = { path = "../common" } serde = { version = "1.0.188", features = ["derive"] } -serde_json = "1.0.107" +serde_yaml = "0.9.25" log = { workspace = true } sha2 = "0.10.8" base64 = "0.21.4" diff --git a/base/src/lib.rs b/base/src/lib.rs index 062b028..132fd45 100644 --- a/base/src/lib.rs +++ b/base/src/lib.rs @@ -12,11 +12,11 @@ use jellycommon::{config::GlobalConfig, AssetLocation}; use std::{fs::File, path::PathBuf, sync::LazyLock}; pub static CONF: LazyLock<GlobalConfig> = LazyLock::new(|| { - serde_json::from_reader( + serde_yaml::from_reader( File::open( std::env::args() .nth(1) - .expect("First argument must specify the config.json to use."), + .expect("First argument must specify the configuration to use."), ) .unwrap(), ) |