From 4994b9a20917a6031a81f60bee0505b45c9ddafc Mon Sep 17 00:00:00 2001
From: Laurent Clouet <laurent@nopnop.net>
Date: Thu, 23 Apr 2015 21:56:57 +0100
Subject: [PATCH] LINE_NUMBER update method does not work, since blender 2.70
 the remaining time is better

---
 src/com/sheepit/client/Client.java | 13 +++----------
 src/com/sheepit/client/Job.java    | 10 ----------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java
index d2806f6..56f5910 100644
--- a/src/com/sheepit/client/Client.java
+++ b/src/com/sheepit/client/Client.java
@@ -51,7 +51,6 @@ import com.sheepit.client.hardware.gpu.GPUDevice;
 import com.sheepit.client.os.OS;
 
 public class Client {
-	public static final String UPDATE_METHOD_BY_LINE_NUMBER = "linenumber";
 	public static final String UPDATE_METHOD_BY_REMAINING_TIME = "remainingtime";
 	public static final String UPDATE_METHOD_BLENDER_INTERNAL_BY_PART = "blenderinternal";
 	
@@ -582,7 +581,6 @@ public class Client {
 		
 		long rending_start = new Date().getTime();
 		
-		int nb_lines = 0;
 		try {
 			String line;
 			this.log.debug(command.toString());
@@ -594,12 +592,11 @@ public class Client {
 			this.log.debug("renderer output");
 			try {
 				while ((line = input.readLine()) != null) {
-					nb_lines++;
 					this.updateRenderingMemoryPeak(line, ajob);
 					
 					this.log.debug(line);
 					if ((new Date().getTime() - last_update_status) > 2000) { // only call the update every two seconds
-						this.updateRenderingStatus(line, nb_lines, ajob);
+						this.updateRenderingStatus(line, ajob);
 						last_update_status = new Date().getTime();
 					}
 					Type error = this.detectError(line, ajob);
@@ -636,7 +633,6 @@ public class Client {
 		
 		ajob.setRenderDuration((int) ((rending_end - rending_start) / 1000 + 1)); // render time is in seconds but the getTime is in milliseconds
 		
-		ajob.setMaxOutputNbLines(nb_lines);
 		int exit_value = 0;
 		try {
 			exit_value = ajob.getProcess().exitValue();
@@ -878,11 +874,8 @@ public class Client {
 		return (concurrent_job >= this.config.maxUploadingJob());
 	}
 	
-	protected void updateRenderingStatus(String line, int current_number_of_lines, Job ajob) {
-		if (ajob.getUpdateRenderingStatusMethod() != null && ajob.getUpdateRenderingStatusMethod().equals(Client.UPDATE_METHOD_BY_LINE_NUMBER) && ajob.getMaxOutputNbLines() > 0) {
-			this.gui.status(String.format("Rendering %s %%", (int) (100.0 * current_number_of_lines / ajob.getMaxOutputNbLines())));
-		}
-		else if (ajob.getUpdateRenderingStatusMethod() != null && ajob.getUpdateRenderingStatusMethod().equals(Client.UPDATE_METHOD_BLENDER_INTERNAL_BY_PART)) {
+	protected void updateRenderingStatus(String line, Job ajob) {
+		if (ajob.getUpdateRenderingStatusMethod() != null && ajob.getUpdateRenderingStatusMethod().equals(Client.UPDATE_METHOD_BLENDER_INTERNAL_BY_PART)) {
 			String search = " Part ";
 			int index = line.lastIndexOf(search);
 			if (index != -1) {
diff --git a/src/com/sheepit/client/Job.java b/src/com/sheepit/client/Job.java
index 7df0a4f..fb84565 100644
--- a/src/com/sheepit/client/Job.java
+++ b/src/com/sheepit/client/Job.java
@@ -35,7 +35,6 @@ public class Job {
 	private long memoryUsed; // in kB
 	private String rendererCommand;
 	private String script;
-	private int maxOutputNbLines;
 	private boolean useGPU;
 	private String extras;
 	private String updateRenderingStatusMethod;
@@ -63,7 +62,6 @@ public class Job {
 		renderDuration = 0;
 		memoryUsed = 0;
 		script = script_;
-		maxOutputNbLines = 0;
 		updateRenderingStatusMethod = update_method_;
 		process = null;
 		askForRendererKill = false;
@@ -106,10 +104,6 @@ public class Job {
 		return updateRenderingStatusMethod;
 	}
 	
-	public int getMaxOutputNbLines() {
-		return maxOutputNbLines;
-	}
-	
 	public void setAskForRendererKill(boolean val) {
 		askForRendererKill = val;
 	}
@@ -142,10 +136,6 @@ public class Job {
 		renderDuration = val;
 	}
 	
-	public void setMaxOutputNbLines(int val) {
-		maxOutputNbLines = val;
-	}
-	
 	public String getRenderCommand() {
 		return rendererCommand;
 	}