Re: [pdm-devel] [PATCH proxmox-datacenter-manager v2 3/4] pdm-api-types: remote tasks: implement From<&str> for TaskStateType

[Wolfgang Bumiller <w.bumiller@proxmox.com>]

On Fri, Apr 11, 2025 at 01:01:16PM +0200, Lukas Wagner wrote:
> 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 {

IMO the From trait is not the right trait for this.

I'd rather just have this as a `from_str` method.
`From` should at least try to be lossless, value-preserving and obvious
(according to its documentation ;-) ), while this implementation fits
none of these ;-)

> +    /// 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 126c9ad3..384dd914 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::from);
>  
>                  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
> -    }
> -}
> -- 
> 2.39.5


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