From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pdm-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3CAB01FF164 for <inbox@lore.proxmox.com>; Fri, 14 Mar 2025 15:13:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 95E2054C6; Fri, 14 Mar 2025 15:13:09 +0100 (CET) From: Lukas Wagner <l.wagner@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Fri, 14 Mar 2025 15:12:23 +0100 Message-Id: <20250314141225.240768-7-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314141225.240768-1-l.wagner@proxmox.com> References: <20250314141225.240768-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH proxmox-datacenter-manager 6/8] pdm-api-types: remote tasks: implement From<&str> for TaskStateType X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion <pdm-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/> List-Post: <mailto:pdm-devel@lists.proxmox.com> List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Datacenter Manager development discussion <pdm-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com> This allows us to get rid of the `tasktype` helper in server::remote_tasks. Signed-off-by: Lukas Wagner <l.wagner@proxmox.com> Reviewed-by: Max Carrara <m.carrara@proxmox.com> --- lib/pdm-api-types/src/lib.rs | 15 +++++++++++++++ server/src/remote_tasks/mod.rs | 15 +-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/pdm-api-types/src/lib.rs b/lib/pdm-api-types/src/lib.rs index 38449071..209155a2 100644 --- a/lib/pdm-api-types/src/lib.rs +++ b/lib/pdm-api-types/src/lib.rs @@ -232,6 +232,21 @@ pub enum TaskStateType { Unknown, } +impl From<&str> for TaskStateType { + /// Parses a task status string into a TaskStateType + fn from(status: &str) -> Self { + if status == "unknown" || status.is_empty() { + TaskStateType::Unknown + } else if status == "OK" { + TaskStateType::OK + } else if status.starts_with("WARNINGS: ") { + TaskStateType::Warning + } else { + TaskStateType::Error + } + } +} + #[api( properties: { upid: { schema: UPID::API_SCHEMA }, diff --git a/server/src/remote_tasks/mod.rs b/server/src/remote_tasks/mod.rs index 48d54694..e4304a3a 100644 --- a/server/src/remote_tasks/mod.rs +++ b/server/src/remote_tasks/mod.rs @@ -132,7 +132,7 @@ pub async fn get_tasks(filters: TaskFilters) -> Result<Vec<TaskListItem>, Error> } } - let state = item.status.as_ref().map(|status| tasktype(status)); + let state = item.status.as_deref().map(TaskStateType::from); match (state, &filters.statusfilter) { (Some(TaskStateType::OK), _) if filters.errors => return false, @@ -471,16 +471,3 @@ fn map_pve_task(task: ListTasksResponse, remote: &str) -> Result<TaskCacheItem, status: task.status, }) } - -/// Parses a task status string into a TaskStateType -pub fn tasktype(status: &str) -> TaskStateType { - if status == "unknown" || status.is_empty() { - TaskStateType::Unknown - } else if status == "OK" { - TaskStateType::OK - } else if status.starts_with("WARNINGS: ") { - TaskStateType::Warning - } else { - TaskStateType::Error - } -} -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel