proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-19 11:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #1999: create a tree view for qm listsnapshot

Browse Source 
The look of the tree is based on the GUI variant, so that we have a
consistent output when run multiple times, too.

Signed-off-by: Rhonda D'Vine <rhonda@proxmox.com>
This commit is contained in:
Rhonda D'Vine 2019-05-10 14:45:55 +02:00 committed by Thomas Lamprecht
parent ca6abacf6b
commit 5f1dc9af73
1 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
PVE/CLI/qm.pm
View File

@ -11,6 +11,7 @@ use File::Path;
use IO::Socket::UNIX; use IO::Socket::UNIX;
use IO::Select; use IO::Select;
use URI::Escape; use URI::Escape;
use POSIX qw(strftime);
use PVE::Tools qw(extract_param); use PVE::Tools qw(extract_param);
use PVE::Cluster; use PVE::Cluster;
@ -922,12 +923,55 @@ our $cmddef = {
listsnapshot => [ "PVE::API2::Qemu", 'snapshot_list', ['vmid'], { node => $nodename }, listsnapshot => [ "PVE::API2::Qemu", 'snapshot_list', ['vmid'], { node => $nodename },
sub { sub {
my $res = shift; my $res = shift;
# "our" scope for the snaptimesort function
my $snapshots = { map { $_->{name} => $_ } @$res };
my $root;
foreach my $e (@$res) { foreach my $e (@$res) {
my $headline = $e->{description} || 'no-description'; if (my $parent = $e->{parent}) {
$headline =~ s/\n.*//sg; push @{$snapshots->{$parent}->{children}}, $e->{name};
my $parent = $e->{parent} // 'no-parent'; } else {
printf("%-20s %-20s %s\n", $e->{name}, $parent, $headline); $root = $e->{name};
}
} }
my $prefix = '`->';
# sort the elements by snaptime - with "current" (no snaptime) highest
my $snaptimesort = sub {
return +1 if !defined $snapshots->{$a}->{snaptime};
return -1 if !defined $snapshots->{$b}->{snaptime};
return $snapshots->{$a}->{snaptime} <=> $snapshots->{$b}->{snaptime};
};
# recursion function for displaying the tree
my $snapshottree;
$snapshottree = sub {
my ($prefix, $root, $snapshots) = @_;
my $e = $snapshots->{$root};
my $description = $e->{description} || 'no-description';
($description) = $description =~ m/(.*)$/m;
# create the timestamp string
my $timestring = "";
if (defined $e->{snaptime}) {
$timestring = strftime("%F %H:%M:%S", localtime($e->{snaptime}));
}
# for aligning the description
my $len = 30 - length($prefix);
printf("%s %-${len}s %-23s %s\n", $prefix, $root, $timestring, $description);
if ($e->{children}) {
$prefix = " $prefix";
foreach my $child (sort $snaptimesort @{$e->{children}}) {
$snapshottree->($prefix, $child, $snapshots);
}
}
};
$snapshottree->($prefix, $root, $snapshots);
}], }],
rollback => [ "PVE::API2::Qemu", 'rollback', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ], rollback => [ "PVE::API2::Qemu", 'rollback', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],