brian/bscreensaver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add example config

Browse Source
This commit is contained in:
Brian Tarricone
2022-05-04 00:27:18 -07:00
parent 92504d279a
commit 2ae04ff91a
5 changed files with 72 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
locker/src/main.rs
View File

@ -279,29 +279,26 @@ fn parse_config() -> anyhow::Result<Configuration> {
use humantime::parse_duration;
let mut config = Configuration::default();
match load_configuration()? {
None => Ok(config),
Some(config_toml) => {
config.lock_timeout = match config_toml.get("lock-timeout") {
None => config.lock_timeout,
Some(val) => parse_duration(val.as_str().ok_or(anyhow!("'lock-timeout' must be a duration string like '10m' or '90s'"))?)?,
};
config.blank_before_locking = match config_toml.get("blank-before-locking") {
None => config.blank_before_locking,
Some(val) => parse_duration(val.as_str().ok_or(anyhow!("'blank-before-locking' must be a duration string like '10m' or '90s'"))?)?,
};
config.dialog_backend = match config_toml.get("dialog-backend") {
None => config.dialog_backend,
Some(val) => DialogBackend::try_from(val.as_str().ok_or(anyhow!("'dialog-backend' must be a string"))?)?,
};
for config_toml in load_configuration()? {
config.lock_timeout = match config_toml.get("lock-timeout") {
None => config.lock_timeout,
Some(val) => parse_duration(val.as_str().ok_or(anyhow!("'lock-timeout' must be a duration string like '10m' or '90s'"))?)?,
};
config.blank_before_locking = match config_toml.get("blank-before-locking") {
None => config.blank_before_locking,
Some(val) => parse_duration(val.as_str().ok_or(anyhow!("'blank-before-locking' must be a duration string like '10m' or '90s'"))?)?,
};
config.dialog_backend = match config_toml.get("dialog-backend") {
None => config.dialog_backend,
Some(val) => DialogBackend::try_from(val.as_str().ok_or(anyhow!("'dialog-backend' must be a string"))?)?,
};
if config.blank_before_locking >= config.lock_timeout {
Err(anyhow!("'blank-before-locking' cannot be greater than 'lock-timeout'"))
} else {
Ok(config)
}
},
if config.blank_before_locking >= config.lock_timeout {
Err(anyhow!("'blank-before-locking' cannot be greater than 'lock-timeout'"))?
}
}
Ok(config)
}
fn init_signals() -> anyhow::Result<SignalFd> {