From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pbs-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id E2BE61FF398 for <inbox@lore.proxmox.com>; Mon, 27 May 2024 16:33:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0BFC64B85; Mon, 27 May 2024 16:33:45 +0200 (CEST) From: Christian Ebner <c.ebner@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Mon, 27 May 2024 16:32:16 +0200 Message-Id: <20240527143323.456002-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240527143323.456002-1-c.ebner@proxmox.com> References: <20240527143323.456002-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v7 pxar 02/69] lib: add type for input/output variant differentiation X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com> Introduce an enum which stores 2 different possible variants of inputs or outputs to be passed to encoder and decoder/accessor instances, depending whether to read/write a fully self contained pxar archive or whether to split off the payload stream into a separate input/output. Co-authored-by: Dominik Csapak <d.csapak@proxmox.com> Signed-off-by: Christian Ebner <c.ebner@proxmox.com> --- changes since version 6: - not present in previous version src/lib.rs | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 210c4b1..f784c9e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -494,3 +494,65 @@ impl Entry { } } } + +#[derive(Clone)] +/// Possible variants of the encoder output and decoder as well as accessor inputs +/// +/// Allow to have a unified or split input/output, depending on whether this is a split +/// archive or not. +pub enum PxarVariant<A, P> { + /// All of the pxar archive is contained within the given input/output + Unified(A), + /// Metadata and payload are split into separate inputs/outputs + Split(A, P), +} + +impl<A, P> PxarVariant<A, P> { + pub fn archive(&self) -> &A { + match self { + PxarVariant::Unified(a) => a, + PxarVariant::Split(a, _) => a, + } + } + + pub fn archive_mut(&mut self) -> &mut A { + match self { + PxarVariant::Unified(a) => a, + PxarVariant::Split(a, _) => a, + } + } + + pub fn payload(&self) -> Option<&P> { + match self { + PxarVariant::Unified(_) => None, + PxarVariant::Split(_, p) => Some(p), + } + } + + pub fn payload_mut(&mut self) -> Option<&mut P> { + match self { + PxarVariant::Unified(_) => None, + PxarVariant::Split(_, p) => Some(p), + } + } + + pub fn wrap_multi<OUT1, OUT2, F1: Fn(A) -> OUT1, F2: Fn(P) -> OUT2>( + self, + f1: F1, + f2: F2, + ) -> PxarVariant<OUT1, OUT2> { + match self { + PxarVariant::Unified(a) => PxarVariant::Unified(f1(a)), + PxarVariant::Split(a, p) => PxarVariant::Split(f1(a), f2(p)), + } + } +} + +impl<IN> PxarVariant<IN, IN> { + pub fn wrap<OUT, F: Fn(IN) -> OUT>(self, f: F) -> PxarVariant<OUT, OUT> { + match self { + PxarVariant::Unified(a) => PxarVariant::Unified(f(a)), + PxarVariant::Split(a, p) => PxarVariant::Split(f(a), f(p)), + } + } +} -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel