From b7d10e6a9dfe7851479e6948b92c72f240555497 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Tue, 21 Nov 2017 20:05:57 +0100 Subject: borg_list: Use JSON with borg 1.1 Signed-off-by: Florian Pritz --- lib/App/BorgRestore/Borg.pm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/App/BorgRestore/Borg.pm b/lib/App/BorgRestore/Borg.pm index 3e531ba..c9e4490 100644 --- a/lib/App/BorgRestore/Borg.pm +++ b/lib/App/BorgRestore/Borg.pm @@ -54,12 +54,21 @@ method borg_version() { method borg_list() { my @archives; - $log->debug("Getting archive list"); - run [qw(borg list), $self->{borg_repo}], '>', \my $output or die $log->error("borg list returned $?")."\n"; + if (Version::Compare::version_compare($self->{borg_version}, "1.1") >= 0) { + $log->debug("Getting archive list via json"); + run [qw(borg list --json), $self->{borg_repo}], '>', \my $output or die $log->error("borg list returned $?")."\n"; + my $json = decode_json($output); + for my $archive (@{$json->{archives}}) { + push @archives, $archive->{archive}; + } + } else { + $log->debug("Getting archive list"); + run [qw(borg list), $self->{borg_repo}], '>', \my $output or die $log->error("borg list returned $?")."\n"; - for (split/^/, $output) { - if (m/^([^\s]+)\s/) { - push @archives, $1; + for (split/^/, $output) { + if (m/^([^\s]+)\s/) { + push @archives, $1; + } } } -- cgit v1.2.3-24-g4f1b