proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-11 19:01:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proxmox-time: move WeekDays into own file

Browse Source 
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-11-30 13:11:58 +01:00 committed by Dietmar Maurer
parent a104c8fc41
commit 07cc21bd5a
4 changed files with 74 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxmox-time/src/lib.rs
View File

@ -15,6 +15,9 @@ pub use time::*;
pub(crate) mod parse_helpers;
mod week_days;
pub use week_days::*;
mod daily_duration;
pub use daily_duration::*;

45
proxmox-time/src/parse_time.rs
View File

@ -16,6 +16,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};
lazy_static! {
static ref TIME_SPAN_UNITS: HashMap<&'static str, f64> = {
@ -98,50 +99,6 @@ struct DateSpec {
day: Vec<DateTimeValue>,
}
fn parse_weekday(i: &str) -> IResult<&str, WeekDays> {
let (i, text) = alpha1(i)?;
match text.to_ascii_lowercase().as_str() {
"monday" | "mon" => Ok((i, WeekDays::MONDAY)),
"tuesday" | "tue" => Ok((i, WeekDays::TUESDAY)),
"wednesday" | "wed" => Ok((i, WeekDays::WEDNESDAY)),
"thursday" | "thu" => Ok((i, WeekDays::THURSDAY)),
"friday" | "fri" => Ok((i, WeekDays::FRIDAY)),
"saturday" | "sat" => Ok((i, WeekDays::SATURDAY)),
"sunday" | "sun" => Ok((i, WeekDays::SUNDAY)),
_ => return Err(parse_error(text, "weekday")),
}
}
fn parse_weekdays_range(i: &str) -> IResult<&str, WeekDays> {
let (i, startday) = parse_weekday(i)?;
let generate_range = |start, end| {
let mut res = 0;
let mut pos = start;
loop {
res |= pos;
if pos >= end { break; }
pos <<= 1;
}
WeekDays::from_bits(res).unwrap()
};
if let (i, Some((_, endday))) = opt(pair(tag(".."),parse_weekday))(i)? {
let start = startday.bits();
let end = endday.bits();
if start > end {
let set1 = generate_range(start, WeekDays::SUNDAY.bits());
let set2 = generate_range(WeekDays::MONDAY.bits(), end);
Ok((i, set1 | set2))
} else {
Ok((i, generate_range(start, end)))
}
} else {
Ok((i, startday))
}
}
fn parse_date_time_comp(max: usize) -> impl Fn(&str) -> IResult<&str, DateTimeValue> {
move |i: &str| {
let (i, value) = parse_time_comp(max)(i)?;

16
proxmox-time/src/time.rs
View File

@ -1,26 +1,12 @@
use std::convert::TryInto;
use anyhow::Error;
use bitflags::bitflags;
use crate::TmEditor;
use crate::WeekDays;
use crate::{parse_calendar_event, parse_time_span};
bitflags!{
/// Defines one or more days of a week.
#[derive(Default)]
pub struct WeekDays: u8 {
const MONDAY = 1;
const TUESDAY = 2;
const WEDNESDAY = 4;
const THURSDAY = 8;
const FRIDAY = 16;
const SATURDAY = 32;
const SUNDAY = 64;
}
}
#[derive(Debug, Clone)]
pub(crate) enum DateTimeValue {
Single(u32),

69
proxmox-time/src/week_days.rs Normal file
View File

@ -0,0 +1,69 @@
use bitflags::bitflags;
use nom::{
bytes::complete::tag,
character::complete::alpha1,
combinator::opt,
sequence::pair,
};
use crate::parse_helpers::{parse_error, IResult};
bitflags! {
/// Defines one or more days of a week.
#[derive(Default)]
pub struct WeekDays: u8 {
const MONDAY = 1;
const TUESDAY = 2;
const WEDNESDAY = 4;
const THURSDAY = 8;
const FRIDAY = 16;
const SATURDAY = 32;
const SUNDAY = 64;
}
}
fn parse_weekday(i: &str) -> IResult<&str, WeekDays> {
let (i, text) = alpha1(i)?;
match text.to_ascii_lowercase().as_str() {
"monday" | "mon" => Ok((i, WeekDays::MONDAY)),
"tuesday" | "tue" => Ok((i, WeekDays::TUESDAY)),
"wednesday" | "wed" => Ok((i, WeekDays::WEDNESDAY)),
"thursday" | "thu" => Ok((i, WeekDays::THURSDAY)),
"friday" | "fri" => Ok((i, WeekDays::FRIDAY)),
"saturday" | "sat" => Ok((i, WeekDays::SATURDAY)),
"sunday" | "sun" => Ok((i, WeekDays::SUNDAY)),
_ => return Err(parse_error(text, "weekday")),
}
}
pub(crate) fn parse_weekdays_range(i: &str) -> IResult<&str, WeekDays> {
let (i, startday) = parse_weekday(i)?;
let generate_range = |start, end| {
let mut res = 0;
let mut pos = start;
loop {
res |= pos;
if pos >= end {
break;
}
pos <<= 1;
}
WeekDays::from_bits(res).unwrap()
};
if let (i, Some((_, endday))) = opt(pair(tag(".."), parse_weekday))(i)? {
let start = startday.bits();
let end = endday.bits();
if start > end {
let set1 = generate_range(start, WeekDays::SUNDAY.bits());
let set2 = generate_range(WeekDays::MONDAY.bits(), end);
Ok((i, set1 | set2))
} else {
Ok((i, generate_range(start, end)))
}
} else {
Ok((i, startday))
}
}