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 [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 047991FF17C for <inbox@lore.proxmox.com>; Wed, 16 Apr 2025 16:29:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1EF57158C; Wed, 16 Apr 2025 16:29:32 +0200 (CEST) Date: Wed, 16 Apr 2025 16:28:59 +0200 From: Wolfgang Bumiller <w.bumiller@proxmox.com> To: Lukas Wagner <l.wagner@proxmox.com> Message-ID: <qflotxmcedslsx7jrq42xf27yo3lsbzrhfizmabylhxjkgoell@7oyvqxexepay> References: <20250411110117.199543-1-l.wagner@proxmox.com> <20250411110117.199543-4-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250411110117.199543-4-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 v2 3/4] 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> Cc: 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> 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