Re: [pdm-devel] [PATCH proxmox-datacenter-manager v5 4/6] pdm-api-types: remote tasks: add new_from_str constructor for TaskStateType

[Dominik Csapak <d.csapak@proxmox.com>]

aside that I'm a bit unsure about the name (though I don't have a better suggesstion), consider this

Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>

On 5/12/25 13:41, Lukas Wagner wrote:
> This allows us to get rid of the `tasktype` helper in
> server::remote_tasks.
> We don't impl `From<&str>` because those should be value-preserving,
> lossless and obvious. Also, the function is not called from_str to
> avoid any confusion with FromStr.
> 
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> ---
> 
> Notes:
>      Changes in v3:
>        - move the function to TaskStateType::new_from_str instead
>          of From<&str>
> 
>   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..9373725c 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 TaskStateType {
> +    /// Construct a new instance from a `&str`.
> +    pub fn new_from_str(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 b0fc052f..f4b92809 100644
> --- a/server/src/remote_tasks/mod.rs
> +++ b/server/src/remote_tasks/mod.rs
> @@ -91,7 +91,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::new_from_str);
>   
>                   match (state, &filters.statusfilter) {
>                       (Some(TaskStateType::OK), _) if filters.errors => return false,
> @@ -148,16 +148,3 @@ pub fn get_cache() -> Result<TaskCache, Error> {
>   
>       Ok(cache)
>   }
> -
> -/// 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
> -    }
> -}



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel