extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-08-16 18:11:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update config-rs (#280)

Browse Source 
* Update config-rs

Also fix our call to current_dir

This should resolve #195

Thanks @conradludgate for the upstream fix!

* Format
This commit is contained in:
Ellie Huxtable
2022-03-17 21:26:57 +00:00
committed by GitHub
parent 32488830b8
commit d270798277
6 changed files with 647 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atuin-server/Cargo.toml
View File

@ -16,7 +16,7 @@ chrono = { version = "0.4", features = ["serde"] }
eyre = "0.6"
uuid = { version = "0.8", features = ["v4"] }
whoami = "1.1.2"
config = "0.11"
config = "0.12"
serde_derive = "1.0.125"
serde = "1.0.126"
serde_json = "1.0.75"

31
atuin-server/src/settings.rs
View File

@ -2,12 +2,12 @@ use std::fs::{create_dir_all, File};
use std::io::prelude::*;
use std::path::PathBuf;
use config::{Config, Environment, File as ConfigFile};
use config::{Config, Environment, File as ConfigFile, FileFormat};
use eyre::{eyre, Result};
pub const HISTORY_PAGE_SIZE: i64 = 100;
#[derive(Clone, Debug, Deserialize)]
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Settings {
pub host: String,
pub port: u16,
@ -33,25 +33,30 @@ impl Settings {
config_file.push("server.toml");
// create the config file if it does not exist
let mut config_builder = Config::builder()
.set_default("host", "127.0.0.1")?
.set_default("port", 8888)?
.set_default("open_registration", false)?
.set_default("db_uri", "default_uri")?
.add_source(Environment::with_prefix("atuin").separator("_"));
let mut s = Config::new();
if config_file.exists() {
s.merge(ConfigFile::with_name(config_file.to_str().unwrap()))?;
config_builder = if config_file.exists() {
config_builder.add_source(ConfigFile::new(
config_file.to_str().unwrap(),
FileFormat::Toml,
))
} else {
let example_config = include_bytes!("../server.toml");
let mut file = File::create(config_file)?;
file.write_all(example_config)?;
}
s.set_default("host", "127.0.0.1")?;
s.set_default("port", 8888)?;
s.set_default("open_registration", false)?;
s.set_default("db_uri", "default_uri")?;
config_builder
};
s.merge(Environment::with_prefix("atuin").separator("_"))?;
let config = config_builder.build()?;
s.try_into()
config
.try_deserialize()
.map_err(|e| eyre!("failed to deserialize: {}", e))
}
}