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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 225F660570 for ; Tue, 17 Nov 2020 11:47:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0FEA2E825 for ; Tue, 17 Nov 2020 11:47:06 +0100 (CET) Received: from dev.dominic.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) by firstgate.proxmox.com (Proxmox) with ESMTP id EDF2EE819 for ; Tue, 17 Nov 2020 11:47:04 +0100 (CET) Received: by dev.dominic.proxmox.com (Postfix, from userid 0) id BCC262234D; Tue, 17 Nov 2020 11:47:04 +0100 (CET) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Cc: Thomas Lamprecht Date: Tue, 17 Nov 2020 11:46:52 +0100 Message-Id: <20201117104652.256046-1-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.375 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [vzdump.pm] Subject: [pve-devel] [PATCH manager v2] vzdump mail: Refactor text part 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: Tue, 17 Nov 2020 10:47:36 -0000 Less lines exeeding the character limit, less nesting, less duplicate code, more readable sprintf arguments. Co-authored-by: Thomas Lamprecht Signed-off-by: Dominic Jäger --- Middle ground sounds good to me :) And separate lines for arguments look nice. PVE/VZDump.pm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index fa387299..59062d2b 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -258,24 +258,26 @@ sub sendmail { # text part my $text = $err ? "$err\n\n" : ''; - $text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", qw(VMID NAME STATUS TIME SIZE FILENAME)); + my $namelength = 20; + $text .= sprintf ( + "%-10s %-${namelength}s %-6s %10s %10s %s\n", + qw(VMID NAME STATUS TIME SIZE FILENAME) + ); foreach my $task (@$tasklist) { - my $vmid = $task->{vmid}; - if ($task->{state} eq 'ok') { - - $text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", $vmid, - substr($task->{hostname}, 0, 20), - $task->{state}, - format_time($task->{backuptime}), - format_size ($task->{size}), - $task->{target}); - } else { - $text .= sprintf ("%-10s %-20s %-6s %10s %8.2fMB %s\n", $vmid, - substr($task->{hostname}, 0, 20), - $task->{state}, - format_time($task->{backuptime}), - 0, '-'); - } + my $name = substr($task->{hostname}, 0, $namelength); + my $successful = $task->{state} eq 'ok'; + my $size = $successful ? format_size ($task->{size}) : 0; + my $filename = $successful ? $task->{target} : '-'; + my $size_fmt = $successful ? "%10s": "%8.2fMB"; + $text .= sprintf( + "%-10s %-${namelength}s %-6s %10s $size_fmt %s\n", + $task->{vmid}, + $name, + $task->{state}, + format_time($task->{backuptime}), + $size, + $filename, + ); } my $text_log_part; -- 2.20.1