From 56239ae6dd27d70f9d1e1584aac8efdd809a9c57 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Mon, 9 Sep 2019 10:25:12 +0200 Subject: [PATCH] Display global stats even when the session has no job --- src/com/sheepit/client/Client.java | 1 - src/com/sheepit/client/Server.java | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java index 72326ce..7f4cd9c 100644 --- a/src/com/sheepit/client/Client.java +++ b/src/com/sheepit/client/Client.java @@ -282,7 +282,6 @@ public class Client { int time_sleep = 1000 * 60 * wait; 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.displayStats(new Stats()); this.suspended = true; int time_slept = 0; while (time_slept < time_sleep && this.running == true) { diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java index 4191aeb..e1e8008 100644 --- a/src/com/sheepit/client/Server.java +++ b/src/com/sheepit/client/Server.java @@ -284,6 +284,16 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager JobInfos jobData = new Persister().read(JobInfos.class, in); 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()); if (serverCode != ServerCode.OK) { @@ -343,14 +353,6 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager 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; } else {