From: "Dominic Jäger" <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] vzdump mail: Refactor text part
Date: Mon, 16 Nov 2020 11:14:57 +0100 [thread overview]
Message-ID: <20201116101457.61771-1-d.jaeger@proxmox.com> (raw)
Less lines, less nesting, less duplicate code, less magic numbers.
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
Depends on the previous patch for #3136.
Admittedly, using a sub and ternary operator might be seen as more complex than
just the if-statements. So I'm not mad if we leave it as it is.
But comparing the (first) parameters of 3 sprintf is not that much fun either.
PVE/VZDump.pm | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 1096d594..aaf8a84d 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -258,24 +258,17 @@ 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;
+ my $conversions = sub { "%-10s %-${namelength}s %-6s %10s $_[0] %s\n" };
+ $text .= sprintf ($conversions->("%10s"), 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_conversion = $successful ? "%10s": "%8.2fMB";
+ $text .= sprintf($conversions->($size_conversion), $task->{vmid}, $name,
+ $task->{state}, format_time($task->{backuptime}), $size, $filename);
}
my $text_log_part;
--
2.20.1
next reply other threads:[~2020-11-16 10:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 10:14 Dominic Jäger [this message]
2020-11-16 17:12 ` Thomas Lamprecht
2020-11-17 8:35 ` Dominic Jäger
2020-11-17 8:48 ` 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=20201116101457.61771-1-d.jaeger@proxmox.com \
--to=d.jaeger@proxmox.com \
--cc=pve-devel@lists.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