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

Display global stats even when the session has no job

Browse Source
This commit is contained in:
Laurent Clouet
2019-09-09 10:25:12 +02:00
parent 86a02015a2
commit 56239ae6dd
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/sheepit/client/Client.java
View File

@@ -282,7 +282,6 @@ public class Client {
int time_sleep = 1000 * 60 * wait; int time_sleep = 1000 * 60 * wait;
Date wakeup_time = new Date(new Date().getTime() + time_sleep); Date wakeup_time = new Date(new Date().getTime() + time_sleep);
this.gui.status(String.format("No job available. Sleeping for %d minutes (will wake up at %tR)", wait, wakeup_time)); this.gui.status(String.format("No job available. Sleeping for %d minutes (will wake up at %tR)", wait, wakeup_time));
this.gui.displayStats(new Stats());
this.suspended = true; this.suspended = true;
int time_slept = 0; int time_slept = 0;
while (time_slept < time_sleep && this.running == true) { while (time_slept < time_sleep && this.running == true) {

18
src/com/sheepit/client/Server.java
View File

@@ -284,6 +284,16 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
JobInfos jobData = new Persister().read(JobInfos.class, in); JobInfos jobData = new Persister().read(JobInfos.class, in);
handleFileMD5DeleteDocument(jobData.getFileMD5s()); handleFileMD5DeleteDocument(jobData.getFileMD5s());
if (jobData.getSessionStats() != null) {
this.client.getGui().displayStats(new Stats(
jobData.getSessionStats().getRemainingFrames(),
jobData.getSessionStats().getPointsEarnedByUser(),
jobData.getSessionStats().getPointsEarnedOnSession(),
jobData.getSessionStats().getRenderableProjects(),
jobData.getSessionStats().getWaitingProjects(),
jobData.getSessionStats().getConnectedMachines()));
}
ServerCode serverCode = ServerCode.fromInt(jobData.getStatus()); ServerCode serverCode = ServerCode.fromInt(jobData.getStatus());
if (serverCode != ServerCode.OK) { if (serverCode != ServerCode.OK) {
@@ -343,14 +353,6 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
jobData.getRenderTask().getRendererInfos().getUpdate_method() jobData.getRenderTask().getRendererInfos().getUpdate_method()
); );
this.client.getGui().displayStats(new Stats(
jobData.getSessionStats().getRemainingFrames(),
jobData.getSessionStats().getPointsEarnedByUser(),
jobData.getSessionStats().getPointsEarnedOnSession(),
jobData.getSessionStats().getRenderableProjects(),
jobData.getSessionStats().getWaitingProjects(),
jobData.getSessionStats().getConnectedMachines()));
return a_job; return a_job;
} }
else { else {