From: Dominik Csapak <d.csapak@proxmox.com>
Date: Fri, 21 Feb 2020 10:02:09 +0000 (+0100)
Subject: list_volumes: try to return vmid also for backups
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1b39642528ffe8ec969525b4cf5b0d0c4aea3c82;p=pve-storage.git

list_volumes: try to return vmid also for backups

this way the content listing api also returns the vmid on content
listings which, among other things, is useful for the gui for
filtering

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index fb06c38..83bbf69 100644
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -921,7 +921,13 @@ my $get_subdir_files = sub {
 	    next if defined($vmid) && $fn !~  m/\S+-$vmid-\S+/;
 	    next if $fn !~ m!/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!;
 
-	    $info = { volid => "$sid:backup/$1", format => $2 };
+	    my $format = $2;
+	    $info = { volid => "$sid:backup/$1", format => $format };
+
+	    if (defined($vmid) || $fn =~ m!\-([0-9]{3,})\-[^/]+\.${format}$!) {
+		$info->{vmid} = $vmid // $1;
+	    }
+
 
 	} elsif ($tt eq 'snippets') {