pcvolkmer/checkbar
1
0
Fork 0
mirror of https://github.com/pcvolkmer/checkbar.git synced 2025-07-02 06:22:53 +00:00
Code Issues Actions Releases Activity

Move duration parsing into sub package

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-02-19 14:32:38 +01:00
parent ebd4df6e54
commit 01afd6eba6
7 changed files with 307 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/config.rs
View File

@ -1,8 +1,8 @@
use parse_duration::parse_duration;
use std::fmt::Formatter;
use std::time::Duration;
use std::{env, fs};
use regex::Regex;
use serde::de::{Error, Visitor};
use serde::{Deserialize, Deserializer};
@ -105,34 +105,11 @@ where
}
}
fn parse_duration(value: &str) -> Option<Duration> {
let mut duration_in_secs = 0;
if let Ok(re) = Regex::new(
r"^((?P<hours>\d+)(h|hour|hours)\s*)?((?P<minutes>\d+)(m|min|mins|minute|minutes)\s*)?((?P<seconds>\d+)(s|sec|secs|second|seconds)?\s*)?$",
) {
if re.is_match(value) {
let parts = re.captures_iter(value).next().unwrap();
if let Some(hours) = parts.name("hours") {
duration_in_secs += hours.as_str().parse::<u64>().unwrap_or(0) * 60 * 60
}
if let Some(minutes) = parts.name("minutes") {
duration_in_secs += minutes.as_str().parse::<u64>().unwrap_or(0) * 60
}
if let Some(seconds) = parts.name("seconds") {
duration_in_secs += seconds.as_str().parse::<u64>().unwrap_or(0)
}
} else {
return None;
}
}
Some(Duration::from_secs(duration_in_secs))
}
#[cfg(test)]
mod tests {
use std::time::Duration;
use crate::config::{parse_duration, Config};
use crate::config::Config;
#[test]
fn test_should_parse_config_with_number_interval() {
@ -221,57 +198,4 @@ mod tests {
assert_eq!(config.interval, None);
assert_eq!(config.checks.len(), 0);
}
macro_rules! multi_assert_eq {
($f:expr, $expected:expr, $ ( $left:expr ), + ) => {
$(
assert_eq!($f($left), $expected, $left);
)+
};
}
#[test]
fn test_should_parse_durations() {
assert_eq!(parse_duration("1m30s"), Some(Duration::from_secs(90)));
assert_eq!(parse_duration("2m"), Some(Duration::from_secs(120)));
assert_eq!(parse_duration("90"), Some(Duration::from_secs(90)));
multi_assert_eq!(
parse_duration,
Some(Duration::from_secs(3661)),
"1h1m1s",
"1hour1min1s",
"1hour1mins1s",
"1hour1minute1sec",
"1hour1minute1secs",
"1hour1minutes1second",
"1hour1minutes1seconds",
"1hours1minutes1seconds"
);
}
#[test]
fn test_should_parse_durations_with_whitespaces() {
assert_eq!(parse_duration("1m 30s"), Some(Duration::from_secs(90)));
assert_eq!(parse_duration("1h 1m 1s"), Some(Duration::from_secs(3661)));
multi_assert_eq!(
parse_duration,
Some(Duration::from_secs(3661)),
"1h 1m 1s",
"1hour 1min 1s",
"1hour 1mins 1s",
"1hour 1minute 1sec",
"1hour 1minute 1secs",
"1hour 1minutes 1second",
"1hour 1minutes 1seconds",
"1hours 1minutes 1seconds"
);
}
#[test]
fn test_should_return_default_for_unparseable_durations() {
assert_eq!(parse_duration("invalid"), None);
assert_eq!(parse_duration("1x30m10q"), None);
}
}