From e32f59ddb38deb0b4b875fd12e21ed5489aa016b Mon Sep 17 00:00:00 2001
From: AGSPhoenix <lx45803@gmail.com>
Date: Fri, 8 Jan 2016 20:53:58 +0100
Subject: [PATCH] Display name of project while rendering

---
 protocol.txt                       | 2 +-
 src/com/sheepit/client/Job.java    | 8 +++++---
 src/com/sheepit/client/Server.java | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/protocol.txt b/protocol.txt
index 5d2eacd..3e12b65 100644
--- a/protocol.txt
+++ b/protocol.txt
@@ -96,7 +96,7 @@ Answer with no error:
 <?xml version="1.0" encoding="utf-8" ?>
 <jobrequest status="0">
     <frames remaining="1187" />
-    <job id="1" use_gpu="1" archive_md5="11d046f9912267a29f99a731c7e4e3b0" revision="0" path="compute_method.blend" frame="0340" synchronous_upload="1">
+    <job id="1" use_gpu="1" archive_md5="11d046f9912267a29f99a731c7e4e3b0" revision="0" path="compute_method.blend" frame="0340" synchronous_upload="1" name="human name">
         <renderer md5="ceda00890578762c6fac96f1a13f671a" commandline=".e --factory-startup --disable-autoexec -b .c -o .o -f .f -x 1" update_method="remainingtime"/>
         <script>import bpy
 # disable the GPU for Cycles
diff --git a/src/com/sheepit/client/Job.java b/src/com/sheepit/client/Job.java
index fa68d76..61b5aba 100644
--- a/src/com/sheepit/client/Job.java
+++ b/src/com/sheepit/client/Job.java
@@ -55,6 +55,7 @@ public class Job {
 	private String rendererCommand;
 	private String script;
 	private boolean useGPU;
+	private String name;
 	private String extras;
 	private String updateRenderingStatusMethod;
 	private boolean synchronousUpload;
@@ -65,7 +66,7 @@ public class Job {
 	private Configuration config;
 	private Log log;
 	
-	public Job(Configuration config_, Gui gui_, Log log_, String id_, String frame_, String revision_, String path_, boolean use_gpu, String command_, String script_, String sceneMd5_, String rendererMd5_, String extras_, boolean synchronous_upload_, String update_method_) {
+	public Job(Configuration config_, Gui gui_, Log log_, String id_, String frame_, String revision_, String path_, boolean use_gpu, String command_, String script_, String sceneMd5_, String rendererMd5_, String name_, String extras_, boolean synchronous_upload_, String update_method_) {
 		config = config_;
 		id = id_;
 		numFrame = frame_;
@@ -75,6 +76,7 @@ public class Job {
 		rendererCommand = command_;
 		sceneMD5 = sceneMd5_;
 		rendererMD5 = rendererMd5_;
+		name = name_;
 		extras = extras_;
 		synchronousUpload = synchronous_upload_;
 		gui = gui_;
@@ -92,7 +94,7 @@ public class Job {
 	}
 	
 	public String toString() {
-		return String.format("Job (numFrame '%s' sceneMD5 '%s' rendererMD5 '%s' ID '%s' revision '%s' pictureFilename '%s' jobPath '%s' gpu %s extras '%s' updateRenderingStatusMethod '%s' render %s)", numFrame, sceneMD5, rendererMD5, id, revision, pictureFilename, path, useGPU, extras, updateRenderingStatusMethod, render);
+		return String.format("Job (numFrame '%s' sceneMD5 '%s' rendererMD5 '%s' ID '%s' revision '%s' pictureFilename '%s' jobPath '%s' gpu %s name '%s' extras '%s' updateRenderingStatusMethod '%s' render %s)", numFrame, sceneMD5, rendererMD5, id, revision, pictureFilename, path, useGPU, name, extras, updateRenderingStatusMethod, render);
 	}
 	
 	public String getId() {
@@ -196,7 +198,7 @@ public class Job {
 	}
 	
 	public Error.Type render() {
-		gui.status("Rendering");
+		gui.status("Rendering " + this.name);
 		RenderProcess process = getProcessRender();
 		String core_script = "import bpy\n" + "bpy.context.user_preferences.system.compute_device_type = \"%s\"\n" + "bpy.context.scene.cycles.device = \"%s\"\n" + "bpy.context.user_preferences.system.compute_device = \"%s\"\n";
 		if (getUseGPU() && config.getGPUDevice() != null) {
diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java
index 02f1bd0..6dba34f 100644
--- a/src/com/sheepit/client/Server.java
+++ b/src/com/sheepit/client/Server.java
@@ -371,7 +371,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
 					e.printStackTrace();
 				}
 				
-				String[] job_node_require_attribute = { "id", "archive_md5", "path", "revision", "use_gpu", "frame", "extras" };
+				String[] job_node_require_attribute = { "id", "archive_md5", "path", "revision", "use_gpu", "frame", "name", "extras" };
 				String[] renderer_node_require_attribute = { "md5", "commandline" };
 				
 				for (String e : job_node_require_attribute) {
@@ -415,6 +415,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
 						script,
 						job_node.getAttribute("archive_md5"),
 						renderer_node.getAttribute("md5"),
+						job_node.getAttribute("name"),
 						frame_extras,
 						synchronous_upload,
 						update_method