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 68CA564E90 for ; Tue, 21 Jul 2020 13:29:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 660DC17BD1 for ; Tue, 21 Jul 2020 13:29:08 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4F78117BC6 for ; Tue, 21 Jul 2020 13:29:07 +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 13365432D1 for ; Tue, 21 Jul 2020 13:29:07 +0200 (CEST) From: Thomas Lamprecht To: pbs-devel@lists.proxmox.com Date: Tue, 21 Jul 2020 13:29:01 +0200 Message-Id: <20200721112901.12088-1-t.lamprecht@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.009 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [freedesktop.org] Subject: [pbs-devel] applied: [PATCH backup] parse_calendar_event: support the weekly special expression 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: Tue, 21 Jul 2020 11:29:08 -0000 While we do not yet support the date specs for CalendarEvent the left out "weekly" special expression[0] dies not requires that support. It is specified to be equivalent with `Mon *-*-* 00:00:00` [0] and this can be implemented with the weekday and time support we already have. [0]: https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events Signed-off-by: Thomas Lamprecht --- src/tools/systemd/parse_time.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/tools/systemd/parse_time.rs b/src/tools/systemd/parse_time.rs index b1cbc38..93657b2 100644 --- a/src/tools/systemd/parse_time.rs +++ b/src/tools/systemd/parse_time.rs @@ -219,7 +219,16 @@ fn parse_calendar_event_incomplete(mut i: &str) -> IResult<&str, CalendarEvent> ..Default::default() })); } - "monthly" | "weekly" | "yearly" | "quarterly" | "semiannually" => { + "weekly" => { + return Ok(("", CalendarEvent { + hour: vec![DateTimeValue::Single(0)], + minute: vec![DateTimeValue::Single(0)], + second: vec![DateTimeValue::Single(0)], + days: WeekDays::MONDAY, + ..Default::default() + })); + } + "monthly" | "yearly" | "quarterly" | "semiannually" => { return Err(parse_error(i, "unimplemented date or time specification")); } _ => { /* continue */ } -- 2.20.1