From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 034F965BD9 for ; Fri, 24 Jul 2020 11:54:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE199976B for ; Fri, 24 Jul 2020 11:53:48 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 719D79761 for ; Fri, 24 Jul 2020 11:53:48 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3E7254329A for ; Fri, 24 Jul 2020 11:53:48 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 24 Jul 2020 11:53:34 +0200 Message-Id: <20200724095335.2869192-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724095335.2869192-1-f.gruenbichler@proxmox.com> References: <20200724095335.2869192-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [commands.rs] Subject: [pve-devel] [PATCH proxmox-backup-qemu v2 2/3] add archive_name helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2020 09:54:19 -0000 since we're about to introduce a third duplicate of this line.. Signed-off-by: Fabian Grünbichler --- src/commands.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/commands.rs b/src/commands.rs index dd00ca9..e2584ab 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -78,16 +78,18 @@ pub(crate) async fn add_config( Ok(0) } +fn archive_name(device_name: &str) -> String { + format!("{}.img.fidx", device_name) +} + pub(crate) fn check_last_incremental_csum( manifest: Arc, device_name: &str, device_size: u64, ) -> bool { - let archive_name = format!("{}.img.fidx", device_name); - match PREVIOUS_CSUMS.lock().unwrap().get(device_name) { - Some(csum) => manifest.verify_file(&archive_name, &csum, device_size).is_ok(), + Some(csum) => manifest.verify_file(&archive_name(device_name), &csum, device_size).is_ok(), None => false, } } @@ -105,7 +107,7 @@ pub(crate) async fn register_image( incremental: bool, ) -> Result { - let archive_name = format!("{}.img.fidx", device_name); + let archive_name = archive_name(&device_name); let index = match manifest { Some(manifest) => { -- 2.20.1