proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-05 12:30:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vzdump mail: Refactor text part

Browse Source 
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>
This commit is contained in:
Dominic Jäger 2020-11-17 11:46:52 +01:00 committed by Thomas Lamprecht
parent d27a44a615
commit 2cc64d0e42
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PVE/VZDump.pm
View File

@ -258,24 +258,26 @@ sub sendmail {
# text part # text part
my $text = $err ? "$err\n\n" : ''; 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) { foreach my $task (@$tasklist) {
my $vmid = $task->{vmid}; my $name = substr($task->{hostname}, 0, $namelength);
if ($task->{state} eq 'ok') { my $successful = $task->{state} eq 'ok';
my $size = $successful ? format_size ($task->{size}) : 0;
$text .= sprintf ("%-10s %-20s %-6s %10s %10s %s\n", $vmid, my $filename = $successful ? $task->{target} : '-';
substr($task->{hostname}, 0, 20), my $size_fmt = $successful ? "%10s": "%8.2fMB";
$text .= sprintf(
"%-10s %-${namelength}s %-6s %10s $size_fmt %s\n",
$task->{vmid},
$name,
$task->{state}, $task->{state},
format_time($task->{backuptime}), format_time($task->{backuptime}),
format_size ($task->{size}), $size,
$task->{target}); $filename,
} 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 $text_log_part; my $text_log_part;