[pdm-devel] [PATCH proxmox-datacenter-manager 6/8] pdm-api-types: remote tasks: implement From<&str> for TaskStateType
Lukas Wagner
l.wagner at proxmox.com
Fri Mar 14 15:12:23 CET 2025
This allows us to get rid of the `tasktype` helper in
server::remote_tasks.
Signed-off-by: Lukas Wagner <l.wagner at proxmox.com>
Reviewed-by: Max Carrara <m.carrara at 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
More information about the pdm-devel
mailing list