From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CF6CC60ECA for ; Fri, 11 Sep 2020 10:35:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B778C22CE4 for ; Fri, 11 Sep 2020 10:35:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9E5CF22CC9 for ; Fri, 11 Sep 2020 10:35:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5C37544B64 for ; Fri, 11 Sep 2020 10:35:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 11 Sep 2020 10:35:25 +0200 Message-Id: <20200911083528.31493-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.121 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record SUBJ_OBFU_PUNCT_FEW 0.001 Possible punctuation-obfuscated Subject: header Subject: [pbs-devel] [PATCH proxmox-backup 1/4] tools/systemd/parse_time: enable */x syntax for calendar events X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2020 08:35:30 -0000 we support this in pve, so also support it here to have a more consistent syntax Signed-off-by: Dominik Csapak --- src/tools/systemd/parse_time.rs | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/tools/systemd/parse_time.rs b/src/tools/systemd/parse_time.rs index d30a1acc..a1e40139 100644 --- a/src/tools/systemd/parse_time.rs +++ b/src/tools/systemd/parse_time.rs @@ -161,10 +161,17 @@ fn parse_date_time_comp(max: usize) -> impl Fn(&str) -> IResult<&str, DateTimeVa } } -fn parse_date_time_comp_list(max: usize) -> impl Fn(&str) -> IResult<&str, Vec> { +fn parse_date_time_comp_list(start: u32, max: usize) -> impl Fn(&str) -> IResult<&str, Vec> { move |i: &str| { if i.starts_with("*") { - return Ok((&i[1..], Vec::new())); + let i = &i[1..]; + if i.starts_with("/") { + let (n, repeat) = parse_time_comp(max)(&i[1..])?; + if repeat > 0 { + return Ok((n, vec![DateTimeValue::Repeated(start, repeat)])); + } + } + return Ok((i, Vec::new())); } separated_nonempty_list(tag(","), parse_date_time_comp(max))(i) @@ -174,9 +181,9 @@ fn parse_date_time_comp_list(max: usize) -> impl Fn(&str) -> IResult<&str, Vec IResult<&str, (Vec, Vec, Vec)> { let (i, (hour, minute, opt_second)) = tuple(( - parse_date_time_comp_list(24), - preceded(tag(":"), parse_date_time_comp_list(60)), - opt(preceded(tag(":"), parse_date_time_comp_list(60))), + parse_date_time_comp_list(0, 24), + preceded(tag(":"), parse_date_time_comp_list(0, 60)), + opt(preceded(tag(":"), parse_date_time_comp_list(0, 60))), ))(i)?; if let Some(second) = opt_second { @@ -190,14 +197,14 @@ fn parse_date_spec(i: &str) -> IResult<&str, (Vec, Vec