From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup 1/2] client: pxar: json encode cli exclude pattern in prelude
Date: Mon, 10 Jun 2024 14:06:48 +0200 [thread overview]
Message-ID: <1718020104.844cbbfs0c.astroid@yuna.none> (raw)
In-Reply-To: <20240610110621.308907-1-c.ebner@proxmox.com>
On June 10, 2024 1:06 pm, Christian Ebner wrote:
> The current encoding is not extensible, so encode the cli exclude
> patterns as json instead. By this, the prelude is easily seralized
> and deserialized, while remaining human readable.
>
> Originally-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> pbs-client/src/pxar/create.rs | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
> index 12a4d92c3..dc0a31e7a 100644
> --- a/pbs-client/src/pxar/create.rs
> +++ b/pbs-client/src/pxar/create.rs
> @@ -16,6 +16,7 @@ use nix::dir::Dir;
> use nix::errno::Errno;
> use nix::fcntl::OFlag;
> use nix::sys::stat::{FileStat, Mode};
> +use serde::{Deserialize, Serialize};
>
> use pathpatterns::{MatchEntry, MatchFlag, MatchList, MatchType, PatternFlag};
> use proxmox_sys::error::SysError;
> @@ -154,6 +155,13 @@ struct ReuseStats {
> total_reencoded_size: u64,
> }
>
> +#[derive(Serialize, Deserialize)]
> +#[serde(rename_all = "kebab-case")]
> +pub(crate) struct PbsClientPrelude {
> + #[serde(skip_serializing_if = "Option::is_none")]
> + exclude_patterns: Option<String>,
> +}
> +
> struct Archiver {
> feature_flags: Flags,
> fs_feature_flags: Flags,
> @@ -239,9 +247,13 @@ where
> )?);
> }
>
> - let cli_params_content = generate_pxar_excludes_cli(&patterns[..]);
> - let cli_params = if options.previous_ref.is_some() {
> - Some(cli_params_content.as_slice())
> + let prelude = if options.previous_ref.is_some() && !patterns.is_empty() {
> + let prelude = PbsClientPrelude {
> + exclude_patterns: Some(String::from_utf8(generate_pxar_excludes_cli(
> + &patterns[..],
> + ))?),
> + };
> + Some(serde_json::to_vec(&prelude)?)
> } else {
> None
> };
> @@ -257,7 +269,7 @@ where
> (None, None)
> };
>
> - let mut encoder = Encoder::new(writers.archive, &metadata, cli_params).await?;
> + let mut encoder = Encoder::new(writers.archive, &metadata, prelude.as_deref()).await?;
>
> let mut archiver = Archiver {
> feature_flags,
> --
> 2.39.2
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
prev parent reply other threads:[~2024-06-10 12:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-10 11:06 [pbs-devel] " Christian Ebner
2024-06-10 11:06 ` [pbs-devel] [PATCH proxmox-backup 2/2] client: pxar: encode prelude based on writer variant Christian Ebner
2024-06-10 12:06 ` [pbs-devel] applied: " Fabian Grünbichler
2024-06-10 12:06 ` Fabian Grünbichler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1718020104.844cbbfs0c.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox