some backup cleanup

Author: 0x7d8

application/src/remote/backups.rs

@@ -1,5 +1,6 @@
 use super::client::Client;
 use crate::server::backup::adapters::BackupAdapter;
+use compact_str::ToCompactString;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use std::collections::BTreeMap;
@@ -14,7 +15,7 @@ pub struct RawServerBackupPart {
 #[derive(Debug, Default, ToSchema, Serialize)]
 pub struct RawServerBackup {
     pub checksum: String,
-    pub checksum_type: String,
+    pub checksum_type: compact_str::CompactString,
     pub size: u64,
     pub files: u64,
     pub successful: bool,
@@ -33,9 +34,9 @@ pub struct ResticBackupConfiguration {
 
 impl ResticBackupConfiguration {
     #[inline]
-    pub fn password(&self) -> Vec<String> {
+    pub fn password(&self) -> Vec<compact_str::CompactString> {
         if let Some(password_file) = &self.password_file {
-            vec!["--password-file".into(), password_file.clone()]
+            vec!["--password-file".into(), password_file.to_compact_string()]
         } else {
             Vec::new()
         }

application/src/server/backup/adapters/btrfs.rs

@@ -214,7 +214,7 @@ impl BackupCreateExt for BtrfsBackup {
                 generation.unwrap_or_default(),
                 uuid.unwrap_or_default()
             ),
-            checksum_type: "btrfs-subvolume".to_string(),
+            checksum_type: "btrfs-subvolume".into(),
             size: total_size,
             files: total_files,
             successful: true,

application/src/server/backup/adapters/ddup_bak.rs

@@ -378,7 +378,7 @@ impl BackupCreateExt for DdupBakBackup {
 
         Ok(RawServerBackup {
             checksum: format!("{}-{:x}", file.metadata().await?.len(), sha1.finalize()),
-            checksum_type: "ddup-sha1".to_string(),
+            checksum_type: "ddup-sha1".into(),
             size: total_size,
             files: total_files,
             successful: true,

application/src/server/backup/adapters/restic.rs

@@ -534,7 +534,7 @@ impl BackupCreateExt for ResticBackup {
 
         Ok(RawServerBackup {
             checksum: snapshot_id.unwrap_or_else(|| "unknown".to_string()),
-            checksum_type: "restic".to_string(),
+            checksum_type: "restic".into(),
             size: total_bytes_processed,
             files: total_files_processed,
             successful: true,

application/src/server/backup/adapters/s3.rs

@@ -183,12 +183,14 @@ impl BackupCreateExt for S3Backup {
 
                 sha1.update(&buffer[..bytes_read]);
                 file.write_all(&buffer[..bytes_read]).await?;
+                total.fetch_add(bytes_read as u64, Ordering::Relaxed);
             }
 
             Ok::<_, anyhow::Error>(format!("{:x}", sha1.finalize()))
         };
 
         let total_task = {
+            let total = Arc::clone(&total);
             let server = server.clone();
             let ignore = ignore.clone();
 
@@ -350,7 +352,7 @@ impl BackupCreateExt for S3Backup {
 
         Ok(RawServerBackup {
             checksum,
-            checksum_type: "sha1".to_string(),
+            checksum_type: "sha1".into(),
             size,
             files: total_files,
             successful: true,

application/src/server/backup/adapters/wings.rs

@@ -268,7 +268,7 @@ impl BackupCreateExt for WingsBackup {
 
         Ok(RawServerBackup {
             checksum: format!("{:x}", checksum_writer.finalize()),
-            checksum_type: "sha1".to_string(),
+            checksum_type: "sha1".into(),
             size,
             files: total_files,
             successful: true,

application/src/server/backup/adapters/zfs.rs

@@ -201,7 +201,7 @@ impl BackupCreateExt for ZfsBackup {
 
         Ok(RawServerBackup {
             checksum: dataset_name,
-            checksum_type: "zfs-subvolume".to_string(),
+            checksum_type: "zfs-subvolume".into(),
             size: total_size,
             files: total_files,
             successful: true,