Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: in text UIs, show render progress in one line (#257)

Browse Source 
The text UI gets quite messy during the render process, as it takes at least one extra line of the screen per second. This PR fixes that issue and also shows an ASCII bar to show the render progress.
This commit is contained in:
Luis Uguina
2020-06-17 18:24:59 +10:00
committed by GitHub
parent ce756db69d
commit b91bf3c0c5
5 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/sheepit/client/standalone/GuiSwing.java
View File

@@ -191,12 +191,16 @@ public class GuiSwing extends JFrame implements Gui {
}
}
@Override public void status(String msg, int progress, long size) {
@Override public void status(String msg, int progress) {
if (activityWorking != null) {
this.activityWorking.setStatus(String.format("%s %d%%", msg, progress));
}
}
@Override public void status(String msg, int progress, long size) {
this.status(msg, progress);
}
@Override public void setRenderingProjectName(String name_) {
if (activityWorking != null) {
this.activityWorking.setRenderingProjectName(name_);

50
src/com/sheepit/client/standalone/GuiText.java
View File

@@ -42,6 +42,7 @@ public class GuiText implements Gui {
private int sigIntCount = 0;
private Log log;
private DateFormat df;
private String eta;
private Client client;
@@ -49,6 +50,7 @@ public class GuiText implements Gui {
this.framesRendered = 0;
this.log = Log.getInstance(null);
this.df = new SimpleDateFormat("MMM dd HH:mm:ss");
this.eta = "";
}
@Override public void start() {
@@ -111,6 +113,10 @@ public class GuiText implements Gui {
}
}
@Override public void status(String msg, int progress) {
this.status(msg, progress, 0);
}
@Override public void status(String msg, int progress, long size) {
System.out.print("\r");
System.out.print(String.format("%s %s", this.df.format(new Date()), showProgress(msg, progress, size)));
@@ -144,7 +150,7 @@ public class GuiText implements Gui {
}
@Override public void setRemainingTime(String time_) {
System.out.println(String.format("%s Rendering (remaining %s)", this.df.format(new Date()), time_));
this.eta = time_;
}
@Override public void setRenderingTime(String time_) {
@@ -169,23 +175,35 @@ public class GuiText implements Gui {
private String showProgress(String message, int progress, long size) {
StringBuilder progressBar = new StringBuilder(140);
progressBar
.append(message)
.append(" ")
.append(String.join("", Collections.nCopies(progress == 0 ? 2 : 2 - (int) (Math.log10(progress)), " ")))
.append(String.format("%d%% [", progress))
.append(String.join("", Collections.nCopies((int)(progress/5), "=")))
.append('>')
.append(String.join("", Collections.nCopies(20 - (int)(progress / 5), " ")))
.append(']');
if (size > 0) {
progressBar.append(String.format(" %dMB", (size / 1024 / 1024)));
if (progress < 100) {
progressBar
.append(message)
.append(" ")
.append(String.join("", Collections.nCopies(progress == 0 ? 2 : 2 - (int) (Math.log10(progress)), " ")))
.append(String.format("%d%% [", progress))
.append(String.join("", Collections.nCopies((int)(progress/5), "=")))
.append('>')
.append(String.join("", Collections.nCopies(20 - (int)(progress / 5), " ")))
.append(']');
if (size > 0) {
progressBar.append(String.format(" %dMB", (size / 1024 / 1024)));
}
if (!this.eta.equals("")) {
progressBar.append(String.format(" ETA %s", this.eta));
}
progressBar.append(String.join("", Collections.nCopies(60 - progressBar.length(), " ")));
}
// Once the process has completed, show the output in a new line
if (progress == 100) {
progressBar.append("\n");
// If progress has reached 100%
else {
progressBar
.append(message)
.append(" done")
.append(String.join("", Collections.nCopies(60 - progressBar.length(), " ")))
.append("\n");
}
return progressBar.toString();

12
src/com/sheepit/client/standalone/GuiTextOneLine.java
View File

@@ -46,6 +46,7 @@ public class GuiTextOneLine implements Gui {
private String computeMethod;
private String status;
private String line;
private String eta;
private int uploadQueueSize;
private long uploadQueueVolume;
@@ -65,6 +66,7 @@ public class GuiTextOneLine implements Gui {
uploadQueueSize = 0;
uploadQueueVolume = 0;
df = new SimpleDateFormat("MMM dd HH:mm:ss");
eta = "";
}
@Override public void start() {
@@ -123,6 +125,10 @@ public class GuiTextOneLine implements Gui {
}
}
@Override public void status(String msg, int progress) {
this.status(msg, progress, 0);
}
@Override public void status(String msg, int progress, long size) {
status = showProgress(msg, progress, size);
updateLine();
@@ -160,7 +166,7 @@ public class GuiTextOneLine implements Gui {
}
@Override public void setRemainingTime(String time_) {
status = "Rendering (remaining " + time_ + ")";
this.eta = time_;
updateLine();
}
@@ -226,6 +232,10 @@ public class GuiTextOneLine implements Gui {
progressBar.append(String.format(" %dMB", (size / 1024 / 1024)));
}
if (!this.eta.equals("")) {
progressBar.append(String.format(" ETA %s", this.eta));
}
return progressBar.toString();
}
}