[pbs-devel] [RFC PATCH proxmox-backup 1/3] api-types: make UploadStatistic an api type

[Dominik Csapak]

and move it to pbs_api_types. We'll want this to expose on the api.

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 pbs-api-types/src/datastore.rs | 38 ++++++++++++++++++++++++++++++++++
 src/api2/backup/environment.rs | 35 +------------------------------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index 73c4890e..41db680c 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -419,6 +419,44 @@ pub struct SnapshotVerifyState {
     pub state: VerifyState,
 }
 
+#[api()]
+#[derive(Copy, Clone, Serialize, Deserialize)]
+/// Chunk upload statistics of a snapshot
+pub struct UploadStatistic {
+    /// Amount of chunks uploaded (incl. duplicates)
+    pub count: u64,
+    /// Uncompressed bytes uploaded
+    pub size: u64,
+    /// Compressed bytes uploaded
+    pub compressed_size: u64,
+    /// Amount of duplicate chunks uploaded
+    pub duplicates: u64,
+}
+
+impl UploadStatistic {
+    pub fn new() -> Self {
+        Self {
+            count: 0,
+            size: 0,
+            compressed_size: 0,
+            duplicates: 0,
+        }
+    }
+}
+
+impl std::ops::Add for UploadStatistic {
+    type Output = Self;
+
+    fn add(self, other: Self) -> Self {
+        Self {
+            count: self.count + other.count,
+            size: self.size + other.size,
+            compressed_size: self.compressed_size + other.compressed_size,
+            duplicates: self.duplicates + other.duplicates,
+        }
+    }
+}
+
 /// A namespace provides a logical separation between backup groups from different domains
 /// (cluster, sites, ...) where uniqueness cannot be guaranteed anymore. It allows users to share a
 /// datastore (i.e., one deduplication domain (chunk store)) with multiple (trusted) sites and
diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs
index 5291bce8..0188bffc 100644
--- a/src/api2/backup/environment.rs
+++ b/src/api2/backup/environment.rs
@@ -3,13 +3,12 @@ use nix::dir::Dir;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
-use ::serde::Serialize;
 use serde_json::{json, Value};
 
 use proxmox_router::{RpcEnvironment, RpcEnvironmentType};
 use proxmox_sys::fs::{lock_dir_noblock_shared, replace_file, CreateOptions};
 
-use pbs_api_types::Authid;
+use pbs_api_types::{Authid, UploadStatistic};
 use pbs_datastore::backup_info::{BackupDir, BackupInfo};
 use pbs_datastore::dynamic_index::DynamicIndexWriter;
 use pbs_datastore::fixed_index::FixedIndexWriter;
@@ -20,38 +19,6 @@ use crate::backup::verify_backup_dir_with_lock;
 
 use hyper::{Body, Response};
 
-#[derive(Copy, Clone, Serialize)]
-struct UploadStatistic {
-    count: u64,
-    size: u64,
-    compressed_size: u64,
-    duplicates: u64,
-}
-
-impl UploadStatistic {
-    fn new() -> Self {
-        Self {
-            count: 0,
-            size: 0,
-            compressed_size: 0,
-            duplicates: 0,
-        }
-    }
-}
-
-impl std::ops::Add for UploadStatistic {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self {
-        Self {
-            count: self.count + other.count,
-            size: self.size + other.size,
-            compressed_size: self.compressed_size + other.compressed_size,
-            duplicates: self.duplicates + other.duplicates,
-        }
-    }
-}
-
 struct DynamicWriterState {
     name: String,
     index: DynamicIndexWriter,
-- 
2.30.2