diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-11 00:54:30 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-06-11 00:54:30 +0200 |
| commit | 5c39e7cf284a1f6e9a1657f2deb44e359fc47eb8 (patch) | |
| tree | c64baa8d5866c8e339eaf660dd3f94f30a3f7d8a /crates/atuin-server/src/settings.rs | |
| parent | chore: Somewhat simplify sync code (diff) | |
| download | atuin-5c39e7cf284a1f6e9a1657f2deb44e359fc47eb8.zip | |
chore: Move everything into one big crate
That helps remove duplicated code and rustc/cargo will now also show
dead code correctly.
Diffstat (limited to '')
| -rw-r--r-- | crates/turtle/src/atuin_server/settings.rs (renamed from crates/atuin-server/src/settings.rs) | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/crates/atuin-server/src/settings.rs b/crates/turtle/src/atuin_server/settings.rs index 3a612be9..f6650af0 100644 --- a/crates/atuin-server/src/settings.rs +++ b/crates/turtle/src/atuin_server/settings.rs @@ -1,13 +1,11 @@ use std::{io::prelude::*, path::PathBuf}; -use atuin_server_database::DbSettings; +use crate::atuin_server_database::DbSettings; use config::{Config, Environment, File as ConfigFile, FileFormat}; use eyre::{Result, eyre}; use fs_err::{File, create_dir_all}; use serde::{Deserialize, Serialize}; -static EXAMPLE_CONFIG: &str = include_str!("../server.toml"); - #[derive(Clone, Debug, Deserialize, Serialize)] pub struct Metrics { #[serde(alias = "enabled")] @@ -60,7 +58,7 @@ impl Settings { PathBuf::from(p) } else { let mut config_file = PathBuf::new(); - let config_dir = atuin_common::utils::config_dir(); + let config_dir = crate::atuin_common::utils::config_dir(); config_file.push(config_dir); config_file }; @@ -87,27 +85,26 @@ impl Settings { .separator("__"), ); - config_builder = if config_file.exists() { - config_builder.add_source(ConfigFile::new( - config_file.to_str().unwrap(), - FileFormat::Toml, - )) + let config = if config_file.exists() { + config_builder + .add_source(ConfigFile::new( + config_file.to_str().unwrap(), + FileFormat::Toml, + )) + .build()? } else { create_dir_all(config_file.parent().unwrap())?; let mut file = File::create(config_file)?; - file.write_all(EXAMPLE_CONFIG.as_bytes())?; - config_builder - }; + let config = config_builder.build()?; + // TODO(@bpeetz): I'm quiet unsure, if this will work <2026-06-10> + file.write_all(config.cache.to_string().as_bytes())?; - let config = config_builder.build()?; + config + }; config .try_deserialize() .map_err(|e| eyre!("failed to deserialize: {}", e)) } } - -pub fn example_config() -> &'static str { - EXAMPLE_CONFIG -} |
