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 25C931FF170
for <inbox@lore.proxmox.com>; Thu, 15 May 2025 08:56:36 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id CCD3A1B175;
Thu, 15 May 2025 08:56:59 +0200 (CEST)
Message-ID: <07aabab0-33c8-4e37-bf0c-3943ace34920@proxmox.com>
Date: Thu, 15 May 2025 08:56:26 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird Beta
To: pdm-devel@lists.proxmox.com
References: <20250512114144.118545-1-l.wagner@proxmox.com>
<20250512114144.118545-5-l.wagner@proxmox.com>
Content-Language: en-US
From: Dominik Csapak <d.csapak@proxmox.com>
In-Reply-To: <20250512114144.118545-5-l.wagner@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [lib.rs, mod.rs]
Subject: Re: [pdm-devel] [PATCH proxmox-datacenter-manager v5 4/6]
pdm-api-types: remote tasks: add new_from_str constructor 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-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pdm-devel-bounces@lists.proxmox.com
Sender: "pdm-devel" <pdm-devel-bounces@lists.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