pcvolkmer/checkbar
1
0
Fork 0
mirror of https://github.com/pcvolkmer/checkbar.git synced 2025-04-19 19:16:50 +00:00
Code Issues Actions Releases Activity

Use Duration not Option<Duration> in Config

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2023-02-25 08:55:12 +01:00
parent 736be69749
commit fa24ae712c
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/config.rs
View File

@ -1,4 +1,4 @@
use parse_duration::parse_duration; use parse_duration::parse;
use std::fmt::Formatter; use std::fmt::Formatter;
use std::time::Duration; use std::time::Duration;
use std::{env, fs}; use std::{env, fs};
@ -12,7 +12,7 @@ pub struct Config {
default = "default_duration", default = "default_duration",
deserialize_with = "deserialize_duration" deserialize_with = "deserialize_duration"
)] )]
pub interval: Option<Duration>, pub interval: Duration,
#[serde(default)] #[serde(default)]
pub colors: ColorConfig, pub colors: ColorConfig,
#[serde(default)] #[serde(default)]
@ -45,7 +45,7 @@ impl Config {
impl Default for Config { impl Default for Config {
fn default() -> Self { fn default() -> Self {
Self { Self {
interval: Some(Duration::from_secs(60)), interval: Duration::from_secs(60),
colors: ColorConfig::default(), colors: ColorConfig::default(),
checks: vec![], checks: vec![],
} }
@ -84,11 +84,11 @@ pub enum CheckType {
Tcp, Tcp,
} }
fn default_duration() -> Option<Duration> { fn default_duration() -> Duration {
Some(Duration::from_secs(60)) Duration::from_secs(60)
} }
fn deserialize_duration<'de, D>(d: D) -> Result<Option<Duration>, D::Error> fn deserialize_duration<'de, D>(d: D) -> Result<Duration, D::Error>
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
@ -117,7 +117,13 @@ where
} }
match d.deserialize_string(StringVisitor) { match d.deserialize_string(StringVisitor) {
Ok(value) => Ok(parse_duration(value.as_str())), Ok(value) => {
return if let Ok(duration) = parse(value.as_str()) {
Ok(duration)
} else {
Ok(Duration::from_secs(60))
}
}
Err(err) => Err(err), Err(err) => Err(err),
} }
} }
@ -141,7 +147,7 @@ mod tests {
) )
.unwrap(); .unwrap();
assert_eq!(config.interval, Some(Duration::from_secs(123))); assert_eq!(config.interval, Duration::from_secs(123));
} }
#[test] #[test]
@ -157,7 +163,7 @@ mod tests {
) )
.unwrap(); .unwrap();
assert_eq!(config.interval, Some(Duration::from_secs(123))); assert_eq!(config.interval, Duration::from_secs(123));
} }
#[test] #[test]
@ -171,7 +177,7 @@ mod tests {
) )
.unwrap(); .unwrap();
assert_eq!(config.interval, Some(Duration::from_secs(60))); assert_eq!(config.interval, Duration::from_secs(60));
} }
#[test] #[test]
@ -203,7 +209,7 @@ mod tests {
#[test] #[test]
fn test_should_read_and_parse_file() { fn test_should_read_and_parse_file() {
let config = Config::read_file("./tests/testconfig1.toml"); let config = Config::read_file("./tests/testconfig1.toml");
assert_eq!(config.interval, Some(Duration::from_secs(10))); assert_eq!(config.interval, Duration::from_secs(10));
assert_eq!(config.checks.len(), 1); assert_eq!(config.checks.len(), 1);
assert_eq!(config.checks[0].name, "www"); assert_eq!(config.checks[0].name, "www");
assert_eq!(config.checks[0].url, "https://example.com"); assert_eq!(config.checks[0].url, "https://example.com");
@ -212,7 +218,7 @@ mod tests {
#[test] #[test]
fn test_should_return_default_if_no_config_file() { fn test_should_return_default_if_no_config_file() {
let config = Config::read_file("./tests/no_testconfig.toml"); let config = Config::read_file("./tests/no_testconfig.toml");
assert_eq!(config.interval, Some(Duration::from_secs(60))); assert_eq!(config.interval, Duration::from_secs(60));
assert_eq!(config.colors.up, "#00FF00".to_string()); assert_eq!(config.colors.up, "#00FF00".to_string());
assert_eq!(config.colors.warn, "#FFFF00".to_string()); assert_eq!(config.colors.warn, "#FFFF00".to_string());
assert_eq!(config.colors.down, "#FF0000".to_string()); assert_eq!(config.colors.down, "#FF0000".to_string());

7
src/main.rs
View File

@ -1,6 +1,5 @@
use checkbar::{get_click_cmd, print_states, read_click_event, run_click_cmd, Config, MouseButton}; use checkbar::{get_click_cmd, print_states, read_click_event, run_click_cmd, Config, MouseButton};
use serde_json::json; use serde_json::json;
use std::time::Duration;
use tokio::task; use tokio::task;
#[tokio::main(flavor = "multi_thread", worker_threads = 2)] #[tokio::main(flavor = "multi_thread", worker_threads = 2)]
@ -32,11 +31,7 @@ async fn main() {
loop { loop {
let config = Config::read(); let config = Config::read();
print_states(&config.checks).await; print_states(&config.checks).await;
let interval = match config.interval { std::thread::sleep(config.interval);
Some(value) => value,
_ => Duration::from_secs(60),
};
std::thread::sleep(interval);
} }
}); });