From 46bd880041cd6f4cd35eb7b3cc143b05bf74acde Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 24 Jun 2019 09:35:37 +0200
Subject: [PATCH] src/api2/backup/environment.rs: new helper add_blob()

---
 src/api2/backup/environment.rs  | 24 ++++++++++++++++++++++++
 src/api2/backup/upload_chunk.rs | 15 ++-------------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs
index 6131b632..14859340 100644
--- a/src/api2/backup/environment.rs
+++ b/src/api2/backup/environment.rs
@@ -384,6 +384,30 @@ impl BackupEnvironment {
         Ok(())
     }
 
+    pub fn add_blob(&self, file_name: &str, data: Vec<u8>) -> Result<(), Error> {
+
+        let mut path = self.datastore.base_path();
+        path.push(self.backup_dir.relative_path());
+        path.push(file_name);
+
+        let blob_len = data.len();
+        let orig_len = data.len(); // fixme:
+
+        let mut blob = DataBlob::from_raw(data)?;
+        // always comput CRC at server side
+        blob.set_crc(blob.compute_crc());
+
+        let raw_data = blob.raw_data();
+        crate::tools::file_set_contents(&path, raw_data, None)?;
+
+        self.log(format!("add blob {:?} ({} bytes, comp: {})", path, orig_len, blob_len));
+
+        let mut state = self.state.lock().unwrap();
+        state.file_counter += 1;
+
+        Ok(())
+    }
+
     /// Mark backup as finished
     pub fn finish_backup(&self) -> Result<(), Error> {
         let mut state = self.state.lock().unwrap();
diff --git a/src/api2/backup/upload_chunk.rs b/src/api2/backup/upload_chunk.rs
index dfc1126d..355941ba 100644
--- a/src/api2/backup/upload_chunk.rs
+++ b/src/api2/backup/upload_chunk.rs
@@ -245,13 +245,10 @@ fn upload_blob(
     let mut file_name = tools::required_string_param(&param, "file-name")?.to_owned();
     let encoded_size = tools::required_integer_param(&param, "encoded-size")? as usize;
 
-    file_name.push_str(".blob");
 
     let env: &BackupEnvironment = rpcenv.as_ref();
 
-    let mut path = env.datastore.base_path();
-    path.push(env.backup_dir.relative_path());
-    path.push(&file_name);
+    file_name.push_str(".blob");
 
     let env2 = env.clone();
     let env3 = env.clone();
@@ -267,15 +264,7 @@ fn upload_blob(
                 bail!("got blob with unexpected length ({} != {})", encoded_size, data.len());
             }
 
-            let orig_len = data.len(); // fixme:
-
-            let mut blob = DataBlob::from_raw(data)?;
-            // always comput CRC at server side
-            blob.set_crc(blob.compute_crc());
-
-            tools::file_set_contents(&path, blob.raw_data(), None)?;
-
-            env2.debug(format!("upload blob {:?} ({} bytes, comp: {})", path, orig_len, encoded_size));
+            env2.add_blob(&file_name, data)?;
 
             Ok(())
         })