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 AE7936C87D for ; Mon, 1 Feb 2021 14:06:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A54732482C for ; Mon, 1 Feb 2021 14:06:28 +0100 (CET) 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 8998C24820 for ; Mon, 1 Feb 2021 14:06:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5679B45796 for ; Mon, 1 Feb 2021 14:06:27 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 1 Feb 2021 14:06:17 +0100 Message-Id: <20210201130618.800923-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210201130618.800923-1-f.gruenbichler@proxmox.com> References: <20210201130618.800923-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.027 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 Subject: [pbs-devel] [PATCH proxmox-backup 2/3] paperkey: simplify block generation X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Feb 2021 13:06:58 -0000 the chunk-iterator already does exactly what we want here.. Signed-off-by: Fabian Grünbichler --- src/tools/paperkey.rs | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/src/tools/paperkey.rs b/src/tools/paperkey.rs index 859e8aed..3c1f7c91 100644 --- a/src/tools/paperkey.rs +++ b/src/tools/paperkey.rs @@ -113,26 +113,18 @@ fn paperkey_html( if is_master { const BLOCK_SIZE: usize = 20; - let blocks = (lines.len() + BLOCK_SIZE -1)/BLOCK_SIZE; - - for i in 0..blocks { - let start = i*BLOCK_SIZE; - let mut end = start + BLOCK_SIZE; - if end > lines.len() { - end = lines.len(); - } - let data = &lines[start..end]; + for (block_nr, block) in lines.chunks(BLOCK_SIZE).enumerate() { writeln!(output, "
")?; writeln!(output, "

")?; - for l in start..end { - writeln!(output, "{:02}: {}", l, lines[l])?; + for (i, line) in block.iter().enumerate() { + writeln!(output, "{:02}: {}", i + block_nr * BLOCK_SIZE, line)?; } writeln!(output, "

")?; - let qr_code = generate_qr_code("svg", data)?; + let qr_code = generate_qr_code("svg", block)?; let qr_code = base64::encode_config(&qr_code, base64::STANDARD_NO_PAD); writeln!(output, "
")?; @@ -192,20 +184,12 @@ fn paperkey_text( if is_private { const BLOCK_SIZE: usize = 5; - let blocks = (lines.len() + BLOCK_SIZE -1)/BLOCK_SIZE; - - for i in 0..blocks { - let start = i*BLOCK_SIZE; - let mut end = start + BLOCK_SIZE; - if end > lines.len() { - end = lines.len(); - } - let data = &lines[start..end]; - for l in start..end { - writeln!(output, "{:-2}: {}", l, lines[l])?; + for (block_nr, block) in lines.chunks(BLOCK_SIZE).enumerate() { + for (i, line) in block.iter().enumerate() { + writeln!(output, "{:-2}: {}", i + block_nr * BLOCK_SIZE, line)?; } - let qr_code = generate_qr_code("utf8i", data)?; + let qr_code = generate_qr_code("utf8i", block)?; let qr_code = String::from_utf8(qr_code) .map_err(|_| format_err!("Failed to read qr code (got non-utf8 data)"))?; writeln!(output, "{}", qr_code)?; -- 2.20.1