From add986cff9c8e1a00428122a0d5515e6bd00120f Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 05 Jan 2019 03:03:04 +0000
Subject: [PATCH] Job monitor...
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java
index ef207a1..596e3b6 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java
@@ -2,7 +2,7 @@
import de.micromata.borgbutler.BorgJob;
import de.micromata.borgbutler.jobs.AbstractJob;
-import de.micromata.borgbutler.json.borg.ProgressMessage;
+import de.micromata.borgbutler.json.borg.ProgressInfo;
import de.micromata.borgbutler.server.user.UserUtils;
import lombok.Getter;
import lombok.Setter;
@@ -18,14 +18,16 @@
@Setter
private String title;
@Getter
+ @Setter
private String description;
@Getter
@Setter
private String progressText;
+ @Getter
@Setter
+ private ProgressInfo progressInfo;
@Getter
- private ProgressMessage progressMessage;
- @Getter
+ @Setter
private String commandLineAsString;
public JsonJob() {
@@ -35,35 +37,40 @@
this.cancellationRequested = borgJob.isCancellationRequested();
this.status = borgJob.getStatus();
this.title = borgJob.getTitle();
- ProgressMessage progressMessage = borgJob.getProgressMessage();
- if (progressMessage != null) {
- this.progressMessage = progressMessage;
- this.progressText = progressMessageToString();
+ ProgressInfo progressInfo = borgJob.getProgressInfo();
+ if (progressInfo != null) {
+ this.progressInfo = progressInfo;
+ buildProgressText();
}
this.commandLineAsString = borgJob.getCommandLineAsString();
this.description = borgJob.getDescription();
}
- public String progressMessageToString() {
- if (progressMessage == null) {
+ /**
+ * Builds and sets progressText from the progressInfo object if given.
+ * @return progressText
+ */
+ public String buildProgressText() {
+ if (progressInfo == null) {
return "";
}
StringBuilder sb = new StringBuilder();
- if (progressMessage.getMessage()!= null) {
- sb.append(progressMessage.getMessage());
+ if (progressInfo.getMessage() != null) {
+ sb.append(progressInfo.getMessage());
}
- if (progressMessage.getCurrent() > 0) {
- sb.append(" (").append(UserUtils.formatNumber(progressMessage.getCurrent()));
- if (progressMessage.getTotal() > 0) {
- sb.append("/").append(UserUtils.formatNumber(progressMessage.getTotal()));
+ if (progressInfo.getCurrent() > 0) {
+ sb.append(" (").append(UserUtils.formatNumber(progressInfo.getCurrent()));
+ if (progressInfo.getTotal() > 0) {
+ sb.append("/").append(UserUtils.formatNumber(progressInfo.getTotal()));
}
sb.append(")");
}
- if (progressMessage.isFinished()) {
+ if (progressInfo.isFinished()) {
sb.append(" (finished)");
}
sb.append(".");
- return sb.toString();
+ progressText = sb.toString();
+ return progressText;
}
}
--
Gitblit v1.10.0