[pbs-devel] [PATCH proxmox-backup 1/4] PruneMark: use copied values instead of references

[pbs-devel] [PATCH proxmox-backup 1/4] PruneMark: use copied values instead of references

[Dominik Csapak]

the type is small enough

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 pbs-datastore/src/prune.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs
index e66ed408..c144b3db 100644
--- a/pbs-datastore/src/prune.rs
+++ b/pbs-datastore/src/prune.rs
@@ -11,12 +11,12 @@ use super::BackupInfo;
 pub enum PruneMark { Protected, Keep, KeepPartial, Remove }
 
 impl PruneMark {
-    pub fn keep(&self) -> bool {
-        *self != PruneMark::Remove
+    pub fn keep(self) -> bool {
+        self != PruneMark::Remove
     }
 
-    pub fn protected(&self) -> bool {
-        *self == PruneMark::Protected
+    pub fn protected(self) -> bool {
+        self == PruneMark::Protected
     }
 }
 
@@ -202,7 +202,7 @@ pub fn compute_prune_info(
             let mark = if info.protected {
                 PruneMark::Protected
             } else {
-                *mark.get(&backup_id).unwrap_or(&PruneMark::Remove)
+                mark.get(&backup_id).copied().unwrap_or(PruneMark::Remove)
             };
 
             (info, mark)
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 2/4] PruneMark: implement display without the write! macro

[Dominik Csapak]

by using write_str instead

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 pbs-datastore/src/prune.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs
index c144b3db..f968e718 100644
--- a/pbs-datastore/src/prune.rs
+++ b/pbs-datastore/src/prune.rs
@@ -22,13 +22,12 @@ impl PruneMark {
 
 impl std::fmt::Display for PruneMark {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let txt = match self {
+        f.write_str(match self {
             PruneMark::Protected => "protected",
             PruneMark::Keep => "keep",
             PruneMark::KeepPartial => "keep-partial",
             PruneMark::Remove => "remove",
-        };
-        write!(f, "{}", txt)
+        })
     }
 }
 
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 3/4] backup-client: use () instead of Value as return type

[Dominik Csapak]

shorter and we do a conversion anyway

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 proxmox-backup-client/src/snapshot.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/proxmox-backup-client/src/snapshot.rs b/proxmox-backup-client/src/snapshot.rs
index 46b1db09..a9976fbe 100644
--- a/proxmox-backup-client/src/snapshot.rs
+++ b/proxmox-backup-client/src/snapshot.rs
@@ -377,7 +377,7 @@ async fn update_notes(param: Value) -> Result<Value, Error> {
     }
 )]
 /// Show protection status of the specified snapshot
-async fn show_protection(param: Value) -> Result<Value, Error> {
+async fn show_protection(param: Value) -> Result<(), Error> {
     let repo = extract_repository_from_value(&param)?;
     let path = required_string_param(&param, "snapshot")?;
 
@@ -411,7 +411,7 @@ async fn show_protection(param: Value) -> Result<Value, Error> {
         );
     }
 
-    Ok(Value::Null)
+    Ok(())
 }
 
 #[api(
@@ -433,7 +433,7 @@ async fn show_protection(param: Value) -> Result<Value, Error> {
     }
 )]
 /// Update Protection Status of a snapshot
-async fn update_protection(protected: bool, param: Value) -> Result<Value, Error> {
+async fn update_protection(protected: bool, param: Value) -> Result<(), Error> {
     let repo = extract_repository_from_value(&param)?;
     let path = required_string_param(&param, "snapshot")?;
 
@@ -451,7 +451,7 @@ async fn update_protection(protected: bool, param: Value) -> Result<Value, Error
 
     client.put(&path, Some(args)).await?;
 
-    Ok(Value::Null)
+    Ok(())
 }
 
 fn protected_cli() -> CliCommandMap {
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 4/4] api: admin/datastore: reuse 'is_protected' implementation

[Dominik Csapak]

we already have that

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/api2/admin/datastore.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index b9bcde12..dcc89147 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -1786,9 +1786,7 @@ pub fn get_protection(
 
     check_priv_or_backup_owner(&datastore, backup_dir.group(), &auth_id, PRIV_DATASTORE_AUDIT)?;
 
-    let protected_path = backup_dir.protected_file(datastore.base_path());
-
-    Ok(protected_path.exists())
+    Ok(backup_dir.is_protected(datastore.base_path()))
 }
 
 #[api(
-- 
2.30.2

[pbs-devel] applied-series: [PATCH proxmox-backup 1/4] PruneMark: use copied values instead of references

[Wolfgang Bumiller]

applied series

On Thu, Oct 28, 2021 at 11:47:52AM +0200, Dominik Csapak wrote:
> the type is small enough
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  pbs-datastore/src/prune.rs | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs
> index e66ed408..c144b3db 100644
> --- a/pbs-datastore/src/prune.rs
> +++ b/pbs-datastore/src/prune.rs
> @@ -11,12 +11,12 @@ use super::BackupInfo;
>  pub enum PruneMark { Protected, Keep, KeepPartial, Remove }
>  
>  impl PruneMark {
> -    pub fn keep(&self) -> bool {
> -        *self != PruneMark::Remove
> +    pub fn keep(self) -> bool {
> +        self != PruneMark::Remove
>      }
>  
> -    pub fn protected(&self) -> bool {
> -        *self == PruneMark::Protected
> +    pub fn protected(self) -> bool {
> +        self == PruneMark::Protected
>      }
>  }
>  
> @@ -202,7 +202,7 @@ pub fn compute_prune_info(
>              let mark = if info.protected {
>                  PruneMark::Protected
>              } else {
> -                *mark.get(&backup_id).unwrap_or(&PruneMark::Remove)
> +                mark.get(&backup_id).copied().unwrap_or(PruneMark::Remove)
>              };
>  
>              (info, mark)
> -- 
> 2.30.2