From 8290a1feaf4bec966be00919cbe5963d4b6e3867 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <k.reinhard@micromata.de>
Date: Mon, 14 Jan 2019 16:23:37 +0000
Subject: [PATCH] Merge pull request #18 from kreinhard/master
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
index 38d496a..707cc8a 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
@@ -3,7 +3,9 @@
import de.micromata.borgbutler.config.BorgRepoConfig;
import de.micromata.borgbutler.config.ConfigurationHandler;
import de.micromata.borgbutler.data.Archive;
+import de.micromata.borgbutler.demo.DemoRepos;
import de.micromata.borgbutler.jobs.AbstractCommandLineJob;
+import de.micromata.borgbutler.jobs.JobResult;
import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.json.borg.ProgressInfo;
import lombok.AccessLevel;
@@ -70,7 +72,7 @@
return commandLine;
}
- protected void processStdErrLine(String line, int level) {
+ public void processStdErrLine(String line, int level) {
try {
if (StringUtils.startsWith(line, "{\"message")) {
ProgressInfo message = JsonUtils.fromJson(ProgressInfo.class, line);
@@ -103,6 +105,14 @@
}
@Override
+ public JobResult<String> execute() {
+ if (DemoRepos.isDemo(command.getRepoConfig().getRepo())) {
+ return DemoRepos.execute(this);
+ }
+ return super.execute();
+ }
+
+ @Override
public BorgJob<?> clone() {
BorgJob<?> clone = new BorgJob<>();
if (command != null) {
--
Gitblit v1.10.0