[pve-devel] applied: [PATCH v2 qemu-server] fix #1999: create a tree view for qm listsnapshot

[Thomas Lamprecht]

Am 5/10/19 um 2:45 PM schrieb Rhonda D'Vine:
> 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 at proxmox.com>

looks good now, applied, thanks!
I removed the comment for the 'our' variable declaration, as you do not use that
anymore, and a few other minor cleanups.

> ---
>  PVE/CLI/qm.pm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
>  1 file changed, 48 insertions(+), 4 deletions(-)
> 
> diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
> index cea2549..279d0d9 100755
> --- a/PVE/CLI/qm.pm
> +++ b/PVE/CLI/qm.pm
> @@ -11,6 +11,7 @@ use File::Path;
>  use IO::Socket::UNIX;
>  use IO::Select;
>  use URI::Escape;
> +use POSIX qw(strftime);
>  
>  use PVE::Tools qw(extract_param);
>  use PVE::Cluster;
> @@ -922,12 +923,55 @@ our $cmddef = {
>      listsnapshot => [ "PVE::API2::Qemu", 'snapshot_list', ['vmid'], { node => $nodename },
>  		    sub {
>  			my $res = shift;
> +
> +			# "our" scope for the snaptimesort function
> +			my $snapshots = { map { $_->{name} => $_ } @$res };
> +
> +			my $root;
>  			foreach my $e (@$res) {
> -			    my $headline = $e->{description} || 'no-description';
> -			    $headline =~ s/\n.*//sg;
> -			    my $parent = $e->{parent} // 'no-parent';
> -			    printf("%-20s %-20s %s\n", $e->{name}, $parent, $headline);
> +			    if (my $parent = $e->{parent}) {
> +				push @{$snapshots->{$parent}->{children}}, $e->{name};
> +			    } else {
> +				$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 ],
>