ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

settings: read and parse timestamp from config only once

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-03-06 08:38:36 -08:00 committed by Martin von Zweigbergk
parent 18861c67c3
commit 9702684a4d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/src/settings.rs
View file

@ -22,6 +22,7 @@ use crate::backend::{Signature, Timestamp};
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
pub struct UserSettings { pub struct UserSettings {
config: config::Config, config: config::Config,
timestamp: Option<Timestamp>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -34,7 +35,14 @@ const TOO_MUCH_CONFIG_ERROR: &str =
impl UserSettings { impl UserSettings {
pub fn from_config(config: config::Config) -> Self { pub fn from_config(config: config::Config) -> Self {
UserSettings { config } let timestamp = match config.get_str("user.timestamp") {
Ok(timestamp_str) => match DateTime::parse_from_rfc3339(&timestamp_str) {
Ok(datetime) => Some(Timestamp::from_datetime(datetime)),
Err(_) => None,
},
Err(_) => None,
};
UserSettings { config, timestamp }
} }
pub fn for_user() -> Result<Self, config::ConfigError> { pub fn for_user() -> Result<Self, config::ConfigError> {
@ -76,7 +84,7 @@ impl UserSettings {
} }
config.merge(env_config)?; config.merge(env_config)?;
Ok(UserSettings { config }) Ok(Self::from_config(config))
} }
pub fn with_repo(&self, repo_path: &Path) -> Result<RepoSettings, config::ConfigError> { pub fn with_repo(&self, repo_path: &Path) -> Result<RepoSettings, config::ConfigError> {
@ -103,13 +111,7 @@ impl UserSettings {
} }
pub fn signature(&self) -> Signature { pub fn signature(&self) -> Signature {
let timestamp = match self.config.get_str("user.timestamp") { let timestamp = self.timestamp.clone().unwrap_or_else(Timestamp::now);
Ok(timestamp_str) => match DateTime::parse_from_rfc3339(&timestamp_str) {
Ok(datetime) => Timestamp::from_datetime(datetime),
Err(_) => Timestamp::now(),
},
Err(_) => Timestamp::now(),
};
Signature { Signature {
name: self.user_name(), name: self.user_name(),
email: self.user_email(), email: self.user_email(),