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 47CE864884 for ; Fri, 30 Oct 2020 15:02:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EF5C1147E1 for ; Fri, 30 Oct 2020 15:02:18 +0100 (CET) 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 E1C431462D for ; Fri, 30 Oct 2020 15:02:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AB5E045F83 for ; Fri, 30 Oct 2020 15:02:16 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 30 Oct 2020 15:02:14 +0100 Message-Id: <20201030140215.13329-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201030140215.13329-1-d.csapak@proxmox.com> References: <20201030140215.13329-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.431 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. [tasks.rs] Subject: [pbs-devel] [PATCH proxmox-backup 5/6] api2/node/tasks: add optional until filter 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, 30 Oct 2020 14:02:19 -0000 so that users select specific time ranges with 'since' and 'until' (e.g. a single day) Signed-off-by: Dominik Csapak --- src/api2/node/tasks.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs index 8fe2aac1..a638b04f 100644 --- a/src/api2/node/tasks.rs +++ b/src/api2/node/tasks.rs @@ -301,6 +301,11 @@ fn stop_task( description: "Only list tasks since this UNIX epoch.", optional: true, }, + until: { + type: i64, + description: "Only list tasks until this UNIX epoch.", + optional: true, + }, typefilter: { optional: true, type: String, @@ -334,6 +339,7 @@ pub fn list_tasks( running: bool, userfilter: Option, since: Option, + until: Option, typefilter: Option, statusfilter: Option>, param: Value, @@ -352,6 +358,13 @@ pub fn list_tasks( let limit = if limit > 0 { limit as usize } else { usize::MAX }; let result: Vec = list + .skip_while(|info| { + match (info, until) { + (Ok(info), Some(until)) => info.upid.starttime > until, + (Ok(_), None) => false, + (Err(_), _) => false, + } + }) .take_while(|info| { match (info, since) { (Ok(info), Some(since)) => info.upid.starttime > since, -- 2.20.1