diff --git a/proxmox-time/src/date_time_value.rs b/proxmox-time/src/date_time_value.rs new file mode 100644 index 00000000..c3c20352 --- /dev/null +++ b/proxmox-time/src/date_time_value.rs @@ -0,0 +1,82 @@ +#[derive(Debug, Clone)] +pub(crate) enum DateTimeValue { + Single(u32), + Range(u32, u32), + Repeated(u32, u32, Option), +} + +impl DateTimeValue { + // Test if the entry contains the value + pub fn contains(&self, value: u32) -> bool { + match self { + DateTimeValue::Single(v) => *v == value, + DateTimeValue::Range(start, end) => value >= *start && value <= *end, + DateTimeValue::Repeated(start, repetition, opt_end) => { + if value >= *start { + if *repetition > 0 { + let offset = value - start; + let res = offset % repetition == 0; + if let Some(end) = opt_end { + res && value <= *end + } else { + res + } + } else { + *start == value + } + } else { + false + } + } + } + } + + pub fn list_contains(list: &[DateTimeValue], value: u32) -> bool { + list.iter().any(|spec| spec.contains(value)) + } + + // Find an return an entry greater than value + pub fn find_next(list: &[DateTimeValue], value: u32) -> Option { + let mut next: Option = None; + let mut set_next = |v: u32| { + if let Some(n) = next { + if v < n { next = Some(v); } + } else { + next = Some(v); + } + }; + for spec in list { + match spec { + DateTimeValue::Single(v) => { + if *v > value { set_next(*v); } + } + DateTimeValue::Range(start, end) => { + if value < *start { + set_next(*start); + } else { + let n = value + 1; + if n >= *start && n <= *end { + set_next(n); + } + } + } + DateTimeValue::Repeated(start, repetition, opt_end) => { + if value < *start { + set_next(*start); + } else if *repetition > 0 { + let n = start + ((value - start + repetition) / repetition) * repetition; + if let Some(end) = opt_end { + if n <= *end { + set_next(n); + } + } else { + set_next(n); + } + } + } + } + } + + next + } +} diff --git a/proxmox-time/src/lib.rs b/proxmox-time/src/lib.rs index bce4b567..3d888a29 100644 --- a/proxmox-time/src/lib.rs +++ b/proxmox-time/src/lib.rs @@ -15,6 +15,8 @@ pub use time::*; pub(crate) mod parse_helpers; +pub(crate) mod date_time_value; + mod week_days; pub use week_days::*; diff --git a/proxmox-time/src/parse_time.rs b/proxmox-time/src/parse_time.rs index 6dde4ae2..00a9241e 100644 --- a/proxmox-time/src/parse_time.rs +++ b/proxmox-time/src/parse_time.rs @@ -17,6 +17,7 @@ use nom::{ use crate::parse_helpers::{parse_complete_line, parse_error, parse_hm_time, parse_time_comp, parse_u64, IResult}; use crate::{parse_weekdays_range, WeekDays}; +use crate::date_time_value::DateTimeValue; lazy_static! { static ref TIME_SPAN_UNITS: HashMap<&'static str, f64> = { diff --git a/proxmox-time/src/time.rs b/proxmox-time/src/time.rs index 2b2a9363..7b9625f9 100644 --- a/proxmox-time/src/time.rs +++ b/proxmox-time/src/time.rs @@ -2,94 +2,12 @@ use std::convert::TryInto; use anyhow::Error; +use crate::date_time_value::DateTimeValue; use crate::TmEditor; use crate::WeekDays; use crate::{parse_calendar_event, parse_time_span}; -#[derive(Debug, Clone)] -pub(crate) enum DateTimeValue { - Single(u32), - Range(u32, u32), - Repeated(u32, u32, Option), -} - -impl DateTimeValue { - // Test if the entry contains the value - pub fn contains(&self, value: u32) -> bool { - match self { - DateTimeValue::Single(v) => *v == value, - DateTimeValue::Range(start, end) => value >= *start && value <= *end, - DateTimeValue::Repeated(start, repetition, opt_end) => { - if value >= *start { - if *repetition > 0 { - let offset = value - start; - let res = offset % repetition == 0; - if let Some(end) = opt_end { - res && value <= *end - } else { - res - } - } else { - *start == value - } - } else { - false - } - } - } - } - - pub fn list_contains(list: &[DateTimeValue], value: u32) -> bool { - list.iter().any(|spec| spec.contains(value)) - } - - // Find an return an entry greater than value - pub fn find_next(list: &[DateTimeValue], value: u32) -> Option { - let mut next: Option = None; - let mut set_next = |v: u32| { - if let Some(n) = next { - if v < n { next = Some(v); } - } else { - next = Some(v); - } - }; - for spec in list { - match spec { - DateTimeValue::Single(v) => { - if *v > value { set_next(*v); } - } - DateTimeValue::Range(start, end) => { - if value < *start { - set_next(*start); - } else { - let n = value + 1; - if n >= *start && n <= *end { - set_next(n); - } - } - } - DateTimeValue::Repeated(start, repetition, opt_end) => { - if value < *start { - set_next(*start); - } else if *repetition > 0 { - let n = start + ((value - start + repetition) / repetition) * repetition; - if let Some(end) = opt_end { - if n <= *end { - set_next(n); - } - } else { - set_next(n); - } - } - } - } - } - - next - } -} - /// Calendar events may be used to refer to one or more points in time in a /// single expression. They are designed after the systemd.time Calendar Events /// specification, but are not guaranteed to be 100% compatible.