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/BorgCommands.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 a5c6355..f9ed76e 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -3,6 +3,7 @@
import de.micromata.borgbutler.config.BorgRepoConfig;
import de.micromata.borgbutler.data.Archive;
import de.micromata.borgbutler.data.Repository;
+import de.micromata.borgbutler.demo.DemoRepos;
import de.micromata.borgbutler.jobs.JobResult;
import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.json.borg.*;
@@ -72,6 +73,7 @@
.setEncryption(repoInfo.getEncryption())
.setSecurityDir(repoInfo.getSecurityDir())
.setLastCacheRefresh(DateUtils.format(LocalDateTime.now()));
+ DemoRepos.repoWasRead(repoConfig, repository);
return repository;
}
@@ -178,7 +180,7 @@
.setTotal(archive.getStats().getNfiles());
BorgJob<List<BorgFilesystemItem>> job = BorgQueueExecutor.getInstance().execute(new BorgJob<List<BorgFilesystemItem>>(command) {
@Override
- protected void processStdOutLine(String line, int level) {
+ public void processStdOutLine(String line, int level) {
BorgFilesystemItem item = JsonUtils.fromJson(BorgFilesystemItem.class, line);
item.setMtime(DateUtils.format(item.getMtime()));
payload.add(item);
@@ -190,7 +192,7 @@
});
job.payload = new ArrayList<>();
JobResult<String> jobResult = job.getResult();
- if (jobResult == null ||jobResult.getStatus() != JobResult.Status.OK) {
+ if (jobResult == null || jobResult.getStatus() != JobResult.Status.OK) {
return null;
}
List<BorgFilesystemItem> items = job.payload;
--
Gitblit v1.10.0