[pdm-devel] [RFC PATCH 3/3] pbs-client: make use of query builder

[Maximiliano Sandoval <m.sandoval@proxmox.com>]

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 server/Cargo.toml        |  1 +
 server/src/pbs_client.rs | 31 ++++++++-----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/server/Cargo.toml b/server/Cargo.toml
index 7b0058e..0c30f93 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -71,6 +71,7 @@ proxmox-acme-api = { workspace = true, features = [ "impl" ] }
 pdm-api-types.workspace = true
 pdm-buildcfg.workspace = true
 pdm-config.workspace = true
+pdm-client.workspace = true
 
 pve-api-types = { workspace = true, features = [ "client" ] }
 pbs-api-types.workspace = true
diff --git a/server/src/pbs_client.rs b/server/src/pbs_client.rs
index c4115c1..ad9ef95 100644
--- a/server/src/pbs_client.rs
+++ b/server/src/pbs_client.rs
@@ -13,6 +13,7 @@ use proxmox_schema::api;
 use proxmox_section_config::typed::SectionConfigData;
 
 use pdm_api_types::remotes::{Remote, RemoteType};
+use pdm_client::api_path_builder::ApiPathBuilder;
 
 pub fn get_remote<'a>(
     config: &'a SectionConfigData<Remote>,
@@ -100,8 +101,9 @@ impl PbsClient {
         datastore: &str,
         namespace: Option<&str>,
     ) -> Result<JsonRecords<pbs_api_types::SnapshotListItem>, anyhow::Error> {
-        let mut path = format!("/api2/extjs/admin/datastore/{datastore}/snapshots");
-        add_query_arg(&mut path, &mut '?', "ns", &namespace);
+        let path = ApiPathBuilder::new(format!("/api2/extjs/admin/datastore/{datastore}/snapshots"))
+            .maybe_arg("ns", &namespace)
+            .build();
         let response = self
             .0
             .streaming_request(http::Method::GET, &path, None::<()>)
@@ -169,10 +171,10 @@ impl PbsClient {
         history: Option<bool>,
         start_time: Option<i64>,
     ) -> Result<pbs_api_types::Metrics, Error> {
-        let mut path = "/api2/extjs/status/metrics".to_string();
-        let mut sep = '?';
-        add_query_arg(&mut path, &mut sep, "history", &history);
-        add_query_arg(&mut path, &mut sep, "start-time", &start_time);
+        let path = ApiPathBuilder::new("/api2/extjs/status/metrics")
+            .maybe_arg("history", &history)
+            .maybe_arg("start-time", &start_time)
+            .build();
 
         Ok(self.0.get(&path).await?.expect_json()?.data)
     }
@@ -192,20 +194,3 @@ impl PbsClient {
 struct JsonData<T> {
     data: T,
 }
-
-/// Add an optional string parameter to the query, and if it was added, change `separator` to `&`.
-fn add_query_arg<T>(query: &mut String, separator: &mut char, name: &str, value: &Option<T>)
-where
-    T: std::fmt::Display,
-{
-    if let Some(value) = value {
-        query.push(*separator);
-        *separator = '&';
-        query.push_str(name);
-        query.push('=');
-        query.extend(percent_encoding::percent_encode(
-            value.to_string().as_bytes(),
-            percent_encoding::NON_ALPHANUMERIC,
-        ));
-    }
-}
-- 
2.39.5



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