From 4b00741086c2a0a399d88de7d124bda47de165f8 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 06 Jan 2019 00:05:45 +0000
Subject: [PATCH] Status message of progress optimized for frontend.
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/queue/JsonJob.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 be2457f..6e89481 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
@@ -7,6 +7,7 @@
import de.micromata.borgbutler.server.user.UserUtils;
import lombok.Getter;
import lombok.Setter;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
public class JsonJob {
@@ -62,22 +63,33 @@
return "";
}
StringBuilder sb = new StringBuilder();
- if (progressInfo.getMessage() != null) {
- sb.append(progressInfo.getMessage());
- }
if (progressInfo.getCurrent() > 0) {
if (StringUtils.indexOf(progressInfo.getMessage(), '%') < 0) {
// No percentage given by borg, try to create an own one:
short percentage = getProgressPercent();
if (percentage >= 0) {
- sb.append(" ").append(percentage).append("%");
+ sb.append(percentage).append("%");
}
}
- sb.append(" (").append(UserUtils.formatNumber(progressInfo.getCurrent()));
- if (progressInfo.getTotal() > 0) {
- sb.append("/").append(UserUtils.formatNumber(progressInfo.getTotal()));
+ sb.append(" (");
+ if ("extract".equals(progressInfo.getMsgid())) {
+ sb.append(FileUtils.byteCountToDisplaySize(progressInfo.getCurrent()));
+ } else {
+ sb.append(UserUtils.formatNumber(progressInfo.getCurrent()));
}
- sb.append(")");
+ if (progressInfo.getTotal() > 0) {
+ sb.append("/");
+ if ("extract".equals(progressInfo.getMsgid())) {
+ sb.append(FileUtils.byteCountToDisplaySize(progressInfo.getTotal()));
+ } else {
+
+ sb.append(UserUtils.formatNumber(progressInfo.getTotal()));
+ }
+ }
+ sb.append("): ");
+ }
+ if (progressInfo.getMessage() != null) {
+ sb.append(progressInfo.getMessage());
}
if (progressInfo.isFinished()) {
sb.append(" (finished)");
--
Gitblit v1.10.0