From: "Dominic Jäger" <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
Subject: [pve-devel] [PATCH manager v2] vzdump mail: Refactor text part
Date: Tue, 17 Nov 2020 11:46:52 +0100 [thread overview]
Message-ID: <20201117104652.256046-1-d.jaeger@proxmox.com> (raw)
Less lines exeeding the character limit, less nesting, less duplicate code,
more readable sprintf arguments.
Co-authored-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
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
next reply other threads:[~2020-11-17 10:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 10:46 Dominic Jäger [this message]
2020-11-17 13:27 ` [pve-devel] applied: " Thomas Lamprecht
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=20201117104652.256046-1-d.jaeger@proxmox.com \
--to=d.jaeger@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=t.lamprecht@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