proxmox-time: move TimeSpan into time_span.rs
and related parsing functions Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
committed by
Dietmar Maurer
Dietmar Maurer
parent
6a680aac55
commit
22b3388500
@ -7,9 +7,6 @@ use anyhow::{bail, format_err, Error};
|
||||
mod tm_editor;
|
||||
pub use tm_editor::*;
|
||||
|
||||
mod parse_time;
|
||||
pub use parse_time::*;
|
||||
|
||||
mod time;
|
||||
pub use time::*;
|
||||
|
||||
@ -20,6 +17,9 @@ pub(crate) mod date_time_value;
|
||||
mod calendar_event;
|
||||
pub use calendar_event::*;
|
||||
|
||||
mod time_span;
|
||||
pub use time_span::*;
|
||||
|
||||
mod week_days;
|
||||
pub use week_days::*;
|
||||
|
||||
|
||||
@ -1,157 +0,0 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use anyhow::{bail, Error};
|
||||
use lazy_static::lazy_static;
|
||||
|
||||
use super::time::*;
|
||||
use super::daily_duration::*;
|
||||
|
||||
use nom::{
|
||||
error::{context, ParseError, VerboseError},
|
||||
bytes::complete::{tag, take_while1},
|
||||
combinator::{map_res, all_consuming, opt, recognize},
|
||||
sequence::{pair, preceded, terminated, tuple},
|
||||
character::complete::{alpha1, space0, digit1},
|
||||
multi::separated_nonempty_list,
|
||||
};
|
||||
|
||||
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> = {
|
||||
let mut map = HashMap::new();
|
||||
|
||||
let second = 1.0;
|
||||
|
||||
map.insert("seconds", second);
|
||||
map.insert("second", second);
|
||||
map.insert("sec", second);
|
||||
map.insert("s", second);
|
||||
|
||||
let msec = second / 1000.0;
|
||||
|
||||
map.insert("msec", msec);
|
||||
map.insert("ms", msec);
|
||||
|
||||
let usec = msec / 1000.0;
|
||||
|
||||
map.insert("usec", usec);
|
||||
map.insert("us", usec);
|
||||
map.insert("µs", usec);
|
||||
|
||||
let nsec = usec / 1000.0;
|
||||
|
||||
map.insert("nsec", nsec);
|
||||
map.insert("ns", nsec);
|
||||
|
||||
let minute = second * 60.0;
|
||||
|
||||
map.insert("minutes", minute);
|
||||
map.insert("minute", minute);
|
||||
map.insert("min", minute);
|
||||
map.insert("m", minute);
|
||||
|
||||
let hour = minute * 60.0;
|
||||
|
||||
map.insert("hours", hour);
|
||||
map.insert("hour", hour);
|
||||
map.insert("hr", hour);
|
||||
map.insert("h", hour);
|
||||
|
||||
let day = hour * 24.0 ;
|
||||
|
||||
map.insert("days", day);
|
||||
map.insert("day", day);
|
||||
map.insert("d", day);
|
||||
|
||||
let week = day * 7.0;
|
||||
|
||||
map.insert("weeks", week);
|
||||
map.insert("week", week);
|
||||
map.insert("w", week);
|
||||
|
||||
let month = 30.44 * day;
|
||||
|
||||
map.insert("months", month);
|
||||
map.insert("month", month);
|
||||
map.insert("M", month);
|
||||
|
||||
let year = 365.25 * day;
|
||||
|
||||
map.insert("years", year);
|
||||
map.insert("year", year);
|
||||
map.insert("y", year);
|
||||
|
||||
map
|
||||
};
|
||||
}
|
||||
|
||||
fn parse_time_unit(i: &str) -> IResult<&str, &str> {
|
||||
let (n, text) = take_while1(|c: char| char::is_ascii_alphabetic(&c) || c == 'µ')(i)?;
|
||||
if TIME_SPAN_UNITS.contains_key(&text) {
|
||||
Ok((n, text))
|
||||
} else {
|
||||
Err(parse_error(text, "time unit"))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Parse a [TimeSpan]
|
||||
pub fn parse_time_span(i: &str) -> Result<TimeSpan, Error> {
|
||||
parse_complete_line("time span", i, parse_time_span_incomplete)
|
||||
}
|
||||
|
||||
fn parse_time_span_incomplete(mut i: &str) -> IResult<&str, TimeSpan> {
|
||||
|
||||
let mut ts = TimeSpan::default();
|
||||
|
||||
loop {
|
||||
i = space0(i)?.0;
|
||||
if i.is_empty() { break; }
|
||||
let (n, num) = parse_u64(i)?;
|
||||
i = space0(n)?.0;
|
||||
|
||||
if let (n, Some(unit)) = opt(parse_time_unit)(i)? {
|
||||
i = n;
|
||||
match unit {
|
||||
"seconds" | "second" | "sec" | "s" => {
|
||||
ts.seconds += num;
|
||||
}
|
||||
"msec" | "ms" => {
|
||||
ts.msec += num;
|
||||
}
|
||||
"usec" | "us" | "µs" => {
|
||||
ts.usec += num;
|
||||
}
|
||||
"nsec" | "ns" => {
|
||||
ts.nsec += num;
|
||||
}
|
||||
"minutes" | "minute" | "min" | "m" => {
|
||||
ts.minutes += num;
|
||||
}
|
||||
"hours" | "hour" | "hr" | "h" => {
|
||||
ts.hours += num;
|
||||
}
|
||||
"days" | "day" | "d" => {
|
||||
ts.days += num;
|
||||
}
|
||||
"weeks" | "week" | "w" => {
|
||||
ts.weeks += num;
|
||||
}
|
||||
"months" | "month" | "M" => {
|
||||
ts.months += num;
|
||||
}
|
||||
"years" | "year" | "y" => {
|
||||
ts.years += num;
|
||||
}
|
||||
_ => return Err(parse_error(unit, "internal error")),
|
||||
}
|
||||
} else {
|
||||
ts.seconds += num;
|
||||
}
|
||||
}
|
||||
|
||||
Ok((i, ts))
|
||||
}
|
||||
@ -1,136 +1,9 @@
|
||||
use anyhow::Error;
|
||||
|
||||
use crate::date_time_value::DateTimeValue;
|
||||
use crate::TmEditor;
|
||||
use crate::WeekDays;
|
||||
|
||||
use crate::{compute_next_event, parse_calendar_event, parse_time_span};
|
||||
|
||||
/// A time spans defines a time duration
|
||||
#[derive(Default, Clone, Debug)]
|
||||
pub struct TimeSpan {
|
||||
pub nsec: u64,
|
||||
pub usec: u64,
|
||||
pub msec: u64,
|
||||
pub seconds: u64,
|
||||
pub minutes: u64,
|
||||
pub hours: u64,
|
||||
pub days: u64,
|
||||
pub weeks: u64,
|
||||
pub months: u64,
|
||||
pub years: u64,
|
||||
}
|
||||
|
||||
impl From<TimeSpan> for f64 {
|
||||
fn from(ts: TimeSpan) -> Self {
|
||||
(ts.seconds as f64) +
|
||||
((ts.nsec as f64) / 1_000_000_000.0) +
|
||||
((ts.usec as f64) / 1_000_000.0) +
|
||||
((ts.msec as f64) / 1_000.0) +
|
||||
((ts.minutes as f64) * 60.0) +
|
||||
((ts.hours as f64) * 3600.0) +
|
||||
((ts.days as f64) * 3600.0 * 24.0) +
|
||||
((ts.weeks as f64) * 3600.0 * 24.0 * 7.0) +
|
||||
((ts.months as f64) * 3600.0 * 24.0 * 30.44) +
|
||||
((ts.years as f64) * 3600.0 * 24.0 * 365.25)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<std::time::Duration> for TimeSpan {
|
||||
fn from(duration: std::time::Duration) -> Self {
|
||||
let mut duration = duration.as_nanos();
|
||||
let nsec = (duration % 1000) as u64;
|
||||
duration /= 1000;
|
||||
let usec = (duration % 1000) as u64;
|
||||
duration /= 1000;
|
||||
let msec = (duration % 1000) as u64;
|
||||
duration /= 1000;
|
||||
let seconds = (duration % 60) as u64;
|
||||
duration /= 60;
|
||||
let minutes = (duration % 60) as u64;
|
||||
duration /= 60;
|
||||
let hours = (duration % 24) as u64;
|
||||
duration /= 24;
|
||||
let years = (duration as f64 / 365.25) as u64;
|
||||
let ydays = (duration as f64 % 365.25) as u64;
|
||||
let months = (ydays as f64 / 30.44) as u64;
|
||||
let mdays = (ydays as f64 % 30.44) as u64;
|
||||
let weeks = mdays / 7;
|
||||
let days = mdays % 7;
|
||||
Self {
|
||||
nsec,
|
||||
usec,
|
||||
msec,
|
||||
seconds,
|
||||
minutes,
|
||||
hours,
|
||||
days,
|
||||
weeks,
|
||||
months,
|
||||
years,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for TimeSpan {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
|
||||
let mut first = true;
|
||||
{ // block scope for mutable borrows
|
||||
let mut do_write = |v: u64, unit: &str| -> Result<(), std::fmt::Error> {
|
||||
if !first {
|
||||
write!(f, " ")?;
|
||||
}
|
||||
first = false;
|
||||
write!(f, "{}{}", v, unit)
|
||||
};
|
||||
if self.years > 0 {
|
||||
do_write(self.years, "y")?;
|
||||
}
|
||||
if self.months > 0 {
|
||||
do_write(self.months, "m")?;
|
||||
}
|
||||
if self.weeks > 0 {
|
||||
do_write(self.weeks, "w")?;
|
||||
}
|
||||
if self.days > 0 {
|
||||
do_write(self.days, "d")?;
|
||||
}
|
||||
if self.hours > 0 {
|
||||
do_write(self.hours, "h")?;
|
||||
}
|
||||
if self.minutes > 0 {
|
||||
do_write(self.minutes, "min")?;
|
||||
}
|
||||
}
|
||||
if !first {
|
||||
write!(f, " ")?;
|
||||
}
|
||||
let seconds = self.seconds as f64 + (self.msec as f64 / 1000.0);
|
||||
if seconds >= 0.1 {
|
||||
if seconds >= 1.0 || !first {
|
||||
write!(f, "{:.0}s", seconds)?;
|
||||
} else {
|
||||
write!(f, "{:.1}s", seconds)?;
|
||||
}
|
||||
} else if first {
|
||||
write!(f, "<0.1s")?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// Verify the format of the [TimeSpan]
|
||||
pub fn verify_time_span(i: &str) -> Result<(), Error> {
|
||||
parse_time_span(i)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
|
||||
use anyhow::bail;
|
||||
use crate::*;
|
||||
|
||||
use super::*;
|
||||
|
||||
fn test_event(v: &'static str) -> Result<(), Error> {
|
||||
match parse_calendar_event(v) {
|
||||
|
||||
265
proxmox-time/src/time_span.rs
Normal file
265
proxmox-time/src/time_span.rs
Normal file
@ -0,0 +1,265 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use anyhow::Error;
|
||||
use lazy_static::lazy_static;
|
||||
use nom::{bytes::complete::take_while1, character::complete::space0, combinator::opt};
|
||||
|
||||
use crate::parse_helpers::{parse_complete_line, parse_error, parse_u64, IResult};
|
||||
|
||||
lazy_static! {
|
||||
static ref TIME_SPAN_UNITS: HashMap<&'static str, f64> = {
|
||||
let mut map = HashMap::new();
|
||||
|
||||
let second = 1.0;
|
||||
|
||||
map.insert("seconds", second);
|
||||
map.insert("second", second);
|
||||
map.insert("sec", second);
|
||||
map.insert("s", second);
|
||||
|
||||
let msec = second / 1000.0;
|
||||
|
||||
map.insert("msec", msec);
|
||||
map.insert("ms", msec);
|
||||
|
||||
let usec = msec / 1000.0;
|
||||
|
||||
map.insert("usec", usec);
|
||||
map.insert("us", usec);
|
||||
map.insert("µs", usec);
|
||||
|
||||
let nsec = usec / 1000.0;
|
||||
|
||||
map.insert("nsec", nsec);
|
||||
map.insert("ns", nsec);
|
||||
|
||||
let minute = second * 60.0;
|
||||
|
||||
map.insert("minutes", minute);
|
||||
map.insert("minute", minute);
|
||||
map.insert("min", minute);
|
||||
map.insert("m", minute);
|
||||
|
||||
let hour = minute * 60.0;
|
||||
|
||||
map.insert("hours", hour);
|
||||
map.insert("hour", hour);
|
||||
map.insert("hr", hour);
|
||||
map.insert("h", hour);
|
||||
|
||||
let day = hour * 24.0;
|
||||
|
||||
map.insert("days", day);
|
||||
map.insert("day", day);
|
||||
map.insert("d", day);
|
||||
|
||||
let week = day * 7.0;
|
||||
|
||||
map.insert("weeks", week);
|
||||
map.insert("week", week);
|
||||
map.insert("w", week);
|
||||
|
||||
let month = 30.44 * day;
|
||||
|
||||
map.insert("months", month);
|
||||
map.insert("month", month);
|
||||
map.insert("M", month);
|
||||
|
||||
let year = 365.25 * day;
|
||||
|
||||
map.insert("years", year);
|
||||
map.insert("year", year);
|
||||
map.insert("y", year);
|
||||
|
||||
map
|
||||
};
|
||||
}
|
||||
|
||||
/// A time spans defines a time duration
|
||||
#[derive(Default, Clone, Debug)]
|
||||
pub struct TimeSpan {
|
||||
pub nsec: u64,
|
||||
pub usec: u64,
|
||||
pub msec: u64,
|
||||
pub seconds: u64,
|
||||
pub minutes: u64,
|
||||
pub hours: u64,
|
||||
pub days: u64,
|
||||
pub weeks: u64,
|
||||
pub months: u64,
|
||||
pub years: u64,
|
||||
}
|
||||
|
||||
impl From<TimeSpan> for f64 {
|
||||
fn from(ts: TimeSpan) -> Self {
|
||||
(ts.seconds as f64)
|
||||
+ ((ts.nsec as f64) / 1_000_000_000.0)
|
||||
+ ((ts.usec as f64) / 1_000_000.0)
|
||||
+ ((ts.msec as f64) / 1_000.0)
|
||||
+ ((ts.minutes as f64) * 60.0)
|
||||
+ ((ts.hours as f64) * 3600.0)
|
||||
+ ((ts.days as f64) * 3600.0 * 24.0)
|
||||
+ ((ts.weeks as f64) * 3600.0 * 24.0 * 7.0)
|
||||
+ ((ts.months as f64) * 3600.0 * 24.0 * 30.44)
|
||||
+ ((ts.years as f64) * 3600.0 * 24.0 * 365.25)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<std::time::Duration> for TimeSpan {
|
||||
fn from(duration: std::time::Duration) -> Self {
|
||||
let mut duration = duration.as_nanos();
|
||||
let nsec = (duration % 1000) as u64;
|
||||
duration /= 1000;
|
||||
let usec = (duration % 1000) as u64;
|
||||
duration /= 1000;
|
||||
let msec = (duration % 1000) as u64;
|
||||
duration /= 1000;
|
||||
let seconds = (duration % 60) as u64;
|
||||
duration /= 60;
|
||||
let minutes = (duration % 60) as u64;
|
||||
duration /= 60;
|
||||
let hours = (duration % 24) as u64;
|
||||
duration /= 24;
|
||||
let years = (duration as f64 / 365.25) as u64;
|
||||
let ydays = (duration as f64 % 365.25) as u64;
|
||||
let months = (ydays as f64 / 30.44) as u64;
|
||||
let mdays = (ydays as f64 % 30.44) as u64;
|
||||
let weeks = mdays / 7;
|
||||
let days = mdays % 7;
|
||||
Self {
|
||||
nsec,
|
||||
usec,
|
||||
msec,
|
||||
seconds,
|
||||
minutes,
|
||||
hours,
|
||||
days,
|
||||
weeks,
|
||||
months,
|
||||
years,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for TimeSpan {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
|
||||
let mut first = true;
|
||||
{
|
||||
// block scope for mutable borrows
|
||||
let mut do_write = |v: u64, unit: &str| -> Result<(), std::fmt::Error> {
|
||||
if !first {
|
||||
write!(f, " ")?;
|
||||
}
|
||||
first = false;
|
||||
write!(f, "{}{}", v, unit)
|
||||
};
|
||||
if self.years > 0 {
|
||||
do_write(self.years, "y")?;
|
||||
}
|
||||
if self.months > 0 {
|
||||
do_write(self.months, "m")?;
|
||||
}
|
||||
if self.weeks > 0 {
|
||||
do_write(self.weeks, "w")?;
|
||||
}
|
||||
if self.days > 0 {
|
||||
do_write(self.days, "d")?;
|
||||
}
|
||||
if self.hours > 0 {
|
||||
do_write(self.hours, "h")?;
|
||||
}
|
||||
if self.minutes > 0 {
|
||||
do_write(self.minutes, "min")?;
|
||||
}
|
||||
}
|
||||
if !first {
|
||||
write!(f, " ")?;
|
||||
}
|
||||
let seconds = self.seconds as f64 + (self.msec as f64 / 1000.0);
|
||||
if seconds >= 0.1 {
|
||||
if seconds >= 1.0 || !first {
|
||||
write!(f, "{:.0}s", seconds)?;
|
||||
} else {
|
||||
write!(f, "{:.1}s", seconds)?;
|
||||
}
|
||||
} else if first {
|
||||
write!(f, "<0.1s")?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_time_unit(i: &str) -> IResult<&str, &str> {
|
||||
let (n, text) = take_while1(|c: char| char::is_ascii_alphabetic(&c) || c == 'µ')(i)?;
|
||||
if TIME_SPAN_UNITS.contains_key(&text) {
|
||||
Ok((n, text))
|
||||
} else {
|
||||
Err(parse_error(text, "time unit"))
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse a [TimeSpan]
|
||||
pub fn parse_time_span(i: &str) -> Result<TimeSpan, Error> {
|
||||
parse_complete_line("time span", i, parse_time_span_incomplete)
|
||||
}
|
||||
|
||||
fn parse_time_span_incomplete(mut i: &str) -> IResult<&str, TimeSpan> {
|
||||
let mut ts = TimeSpan::default();
|
||||
|
||||
loop {
|
||||
i = space0(i)?.0;
|
||||
if i.is_empty() {
|
||||
break;
|
||||
}
|
||||
let (n, num) = parse_u64(i)?;
|
||||
i = space0(n)?.0;
|
||||
|
||||
if let (n, Some(unit)) = opt(parse_time_unit)(i)? {
|
||||
i = n;
|
||||
match unit {
|
||||
"seconds" | "second" | "sec" | "s" => {
|
||||
ts.seconds += num;
|
||||
}
|
||||
"msec" | "ms" => {
|
||||
ts.msec += num;
|
||||
}
|
||||
"usec" | "us" | "µs" => {
|
||||
ts.usec += num;
|
||||
}
|
||||
"nsec" | "ns" => {
|
||||
ts.nsec += num;
|
||||
}
|
||||
"minutes" | "minute" | "min" | "m" => {
|
||||
ts.minutes += num;
|
||||
}
|
||||
"hours" | "hour" | "hr" | "h" => {
|
||||
ts.hours += num;
|
||||
}
|
||||
"days" | "day" | "d" => {
|
||||
ts.days += num;
|
||||
}
|
||||
"weeks" | "week" | "w" => {
|
||||
ts.weeks += num;
|
||||
}
|
||||
"months" | "month" | "M" => {
|
||||
ts.months += num;
|
||||
}
|
||||
"years" | "year" | "y" => {
|
||||
ts.years += num;
|
||||
}
|
||||
_ => return Err(parse_error(unit, "internal error")),
|
||||
}
|
||||
} else {
|
||||
ts.seconds += num;
|
||||
}
|
||||
}
|
||||
|
||||
Ok((i, ts))
|
||||
}
|
||||
|
||||
/// Verify the format of the [TimeSpan]
|
||||
pub fn verify_time_span(i: &str) -> Result<(), Error> {
|
||||
parse_time_span(i)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user