From 0a7181d0d1f040a3aff9f41256171a7b1b7ba3da Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 08 Dec 2018 23:02:28 +0000
Subject: [PATCH] ...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
index a9a2893..41da950 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -4,7 +4,6 @@
import de.micromata.borgbutler.config.Configuration;
import de.micromata.borgbutler.config.ConfigurationHandler;
import de.micromata.borgbutler.json.JsonUtils;
-import de.micromata.borgbutler.json.borg.Archive1;
import de.micromata.borgbutler.json.borg.ArchiveList;
import de.micromata.borgbutler.json.borg.RepoInfo;
import de.micromata.borgbutler.json.borg.RepoList;
@@ -45,8 +44,8 @@
* @param archive
* @return
*/
- public static ArchiveList info(BorgRepoConfig repoConfig, Archive1 archive) {
- String json = execute(repoConfig, "info", repoConfig.getRepo() + "::" + archive.getArchive(), "--json");
+ public static ArchiveList info(BorgRepoConfig repoConfig, String archive) {
+ String json = execute(repoConfig, "info", repoConfig.getRepo() + "::" + archive, "--json");
if (json == null) {
return null;
}
@@ -65,6 +64,17 @@
return repoList;
}
+ public static String list(BorgRepoConfig repoConfig, String archive) {
+ String json = execute(repoConfig, "list", repoConfig.getRepo() + "::" + archive,
+ "--json-lines");
+ if (json == null) {
+ return null;
+ }
+ // RepoList repoList = JsonUtils.fromJson(RepoList.class, json);
+ // repoList.setOriginalJson(json);
+ return json;
+ }
+
private static String execute(BorgRepoConfig repoConfig, String command, String repoOrArchive, String... args) {
CommandLine cmdLine = new CommandLine(ConfigurationHandler.getConfiguration().getBorgCommand());
cmdLine.addArgument(command);
--
Gitblit v1.10.0