public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH yew-comp 3/7] utils: factor out task description into own function
Date: Mon, 20 Jan 2025 10:29:53 +0100	[thread overview]
Message-ID: <20250120093006.927014-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250120093006.927014-1-d.csapak@proxmox.com>

we'll need this separated from the UPID parsing code, so we can also use
info from e.g. a `PveUpid` that we don't have here (yet).

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/utils.rs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/utils.rs b/src/utils.rs
index 24de356..d500b6d 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -227,20 +227,22 @@ pub fn init_task_descr_table_base() {
     register_task_description("srvreload", (tr!("Service"), tr!("Reload")));
 }
 
+/// Uses information from the given [`UPID`] to render the task description with [`format_task_description`]
 pub fn format_upid(upid: &str) -> String {
     match upid.parse::<UPID>() {
         Err(_) => upid.to_string(),
-        Ok(upid) => {
-            if let Some(text) =
-                lookup_task_description(upid.worker_type.as_str(), upid.worker_id.as_deref())
-            {
-                text
-            } else {
-                match (upid.worker_type.as_str(), upid.worker_id) {
-                    (worker_type, Some(id)) => format!("{} {}", worker_type, id),
-                    (worker_type, None) => worker_type.to_string(),
-                }
-            }
+        Ok(upid) => format_task_description(&upid.worker_type, upid.worker_id.as_deref()),
+    }
+}
+
+/// Formats the given worker type and id to a Human readable task description
+pub fn format_task_description(worker_type: &str, worker_id: Option<&str>) -> String {
+    if let Some(text) = lookup_task_description(worker_type, worker_id) {
+        text
+    } else {
+        match worker_id {
+            Some(id) => format!("{} {}", worker_type, id),
+            None => worker_type.to_string(),
         }
     }
 }
-- 
2.39.5



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


  parent reply	other threads:[~2025-01-20  9:30 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-20  9:29 [pdm-devel] [PATCH yew-comp/datacenter-manager] ui: implement remote task list Dominik Csapak
2025-01-20  9:29 ` [pdm-devel] [PATCH yew-comp 1/7] tasks: make date filter functional Dominik Csapak
2025-01-20 11:30   ` Thomas Lamprecht
2025-01-20 12:10     ` Dominik Csapak
2025-01-21  8:33       ` Thomas Lamprecht
2025-01-21  9:46         ` Dominik Csapak
2025-01-20  9:29 ` [pdm-devel] [PATCH yew-comp 2/7] tasks: load more tasks on end of list Dominik Csapak
2025-01-20 17:29   ` Thomas Lamprecht
2025-01-21  9:43     ` Dominik Csapak
2025-01-20  9:29 ` Dominik Csapak [this message]
2025-01-20 17:29   ` [pdm-devel] [PATCH yew-comp 3/7] utils: factor out task description into own function Thomas Lamprecht
2025-01-21  9:44     ` Dominik Csapak
2025-01-20  9:29 ` [pdm-devel] [PATCH yew-comp 4/7] running tasks: make TaskListItem renderer configurable Dominik Csapak
2025-01-20  9:29 ` [pdm-devel] [PATCH yew-comp 5/7] running tasks: make buttons configurable Dominik Csapak
2025-01-20  9:29 ` [pdm-devel] [PATCH yew-comp 6/7] tasks: make columns configurable Dominik Csapak
2025-01-20 17:37   ` Thomas Lamprecht
2025-01-20  9:29 ` [pdm-devel] [PATCH yew-comp 7/7] tasks: make the 'show task' action configurable Dominik Csapak
2025-01-20  9:29 ` [pdm-devel] [PATCH datacenter-manager 1/9] server: factor out task filters into `TaskFilters` type Dominik Csapak
2025-01-20 17:42   ` Thomas Lamprecht
2025-01-20  9:29 ` [pdm-devel] [PATCH datacenter-manager 2/9] server: task cache: skip remotes with errors on fetch Dominik Csapak
2025-01-20 17:45   ` Thomas Lamprecht
2025-01-21  8:29     ` Dietmar Maurer
2025-01-20  9:30 ` [pdm-devel] [PATCH datacenter-manager 3/9] server: task cache: add filter options Dominik Csapak
2025-01-20  9:30 ` [pdm-devel] [PATCH datacenter-manager 4/9] server: task cache: reverse task order Dominik Csapak
2025-01-20  9:30 ` [pdm-devel] [PATCH datacenter-manager 5/9] pdm-client: export PveUpid Dominik Csapak
2025-01-20  9:30 ` [pdm-devel] [PATCH datacenter-manager 6/9] ui: refactor RemoteConfigPanel into own module Dominik Csapak
2025-01-20  9:30 ` [pdm-devel] [PATCH datacenter-manager 7/9] ui: remotes: add tasks to global remote panel Dominik Csapak
2025-01-20  9:30 ` [pdm-devel] [PATCH datacenter-manager 8/9] ui: register pve tasks Dominik Csapak
2025-01-20  9:30 ` [pdm-devel] [PATCH datacenter-manager 9/9] ui: also show running remote tasks in 'running tasks' list Dominik Csapak
2025-01-20 11:27 ` [pdm-devel] applied: [PATCH yew-comp/datacenter-manager] ui: implement remote task list Dietmar Maurer
2025-01-20 11:34   ` Thomas Lamprecht
2025-01-21  8:41 ` [pdm-devel] " Lukas Wagner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250120093006.927014-4-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pdm-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal