apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-24 13:15:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polish client status line

Browse Source
This commit is contained in:
Peter Palaga
2020-10-23 16:28:45 +02:00
parent d89a65aa6b
commit bc2fabe788
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/src/main/java/org/jboss/fuse/mvnd/common/logging/TerminalOutput.java
View File

@@ -63,7 +63,7 @@ public class TerminalOutput implements ClientOutput {
private int linesPerProject = 0; private int linesPerProject = 0;
private boolean displayDone = false; private boolean displayDone = false;
private long start; private final long start;
private String name; private String name;
private int totalProjects; private int totalProjects;
private int doneProjects; private int doneProjects;
@@ -103,6 +103,7 @@ public class TerminalOutput implements ClientOutput {
} }
public TerminalOutput(Path logFile) throws IOException { public TerminalOutput(Path logFile) throws IOException {
this.start = System.currentTimeMillis();
this.queue = new LinkedBlockingDeque<>(); this.queue = new LinkedBlockingDeque<>();
this.terminal = TerminalBuilder.terminal(); this.terminal = TerminalBuilder.terminal();
terminal.enterRawMode(); terminal.enterRawMode();
@@ -118,7 +119,6 @@ public class TerminalOutput implements ClientOutput {
public void startBuild(String name, int projects, int cores) { public void startBuild(String name, int projects, int cores) {
this.name = name; this.name = name;
this.start = System.currentTimeMillis();
this.totalProjects = projects; this.totalProjects = projects;
this.doneProjects = 0; this.doneProjects = 0;
this.usedCores = cores; this.usedCores = cores;
@@ -311,29 +311,29 @@ public class TerminalOutput implements ClientOutput {
int dispLines = rows - 1; // for the "Building..." line int dispLines = rows - 1; // for the "Building..." line
dispLines--; // there's a bug which sometimes make the cursor goes one line below, so keep one more line empty at the end dispLines--; // there's a bug which sometimes make the cursor goes one line below, so keep one more line empty at the end
if (projects.size() <= dispLines) { if (projects.size() <= dispLines) {
String dstr = "";
if (start > 0) {
long sec = (System.currentTimeMillis() - this.start) / 1000;
if (sec > 60) {
dstr = "(time: " + (sec / 60) + "m" + (sec % 60) + "s)";
} else {
dstr = "(time: " + sec + "s)";
}
}
String pstr = "";
if (totalProjects > 0) {
pstr = "(progress: " + ((doneProjects * 100) / totalProjects) + "% - " + doneProjects + " out of "
+ totalProjects + " projects)";
}
if (name != null) { if (name != null) {
AttributedStringBuilder asb = new AttributedStringBuilder(); AttributedStringBuilder asb = new AttributedStringBuilder();
asb.append("Building "); asb.append("Building ");
asb.style(AttributedStyle.BOLD); asb.style(AttributedStyle.BOLD);
asb.append(name); asb.append(name);
asb.style(AttributedStyle.DEFAULT); asb.style(AttributedStyle.DEFAULT);
asb.append("... (cores: ").append(String.valueOf(usedCores)).append(")")
.append(dstr).append(pstr); StringBuilder statusLine = new StringBuilder(64);
lines.add(asb.toAttributedString()); statusLine.append(" threads: ").append(usedCores);
statusLine.append(" time: ");
long sec = (System.currentTimeMillis() - this.start) / 1000;
if (sec > 60) {
statusLine.append(sec / 60).append('m').append(String.valueOf(sec % 60)).append('s');
} else {
statusLine.append(sec).append('s');
}
if (totalProjects > 0) {
statusLine.append(" progress: ").append(doneProjects).append('/').append(totalProjects).append(' ')
.append(doneProjects * 100 / totalProjects).append('%');
}
lines.add(asb.append(statusLine.toString()).toAttributedString());
} }
int remLogLines = dispLines - projects.size(); int remLogLines = dispLines - projects.size();
for (Project prj : projects.values()) { for (Project prj : projects.values()) {