Merge branch 'ref/v7.1-extras' into 'master'

Cleanup: since the v7.1 extras is not used anymore

See merge request sheepitrenderfarm/client!120

protocol.txt

@@ -126,7 +126,7 @@ Answer with no error:
 <?xml version="1.0" encoding="utf-8" ?>
 <jobrequest status="0">
 	<stats credits_session="0" credits_total="6318899" frame_remaining="36830" waiting_project="42" connected_machine="773" renderable_project="0" />
-	<job id="1" use_gpu="1" archive_md5="db26b54689516484633b7d4855fb1567" path="compute-method.blend" frame="0340" synchronous_upload="1" extras="" validation_url="https%3A%2F%2Fsheepit-renderfarm.com%2Fserver%2Fsend_frame.php%3Fjob%3D1%26frame%3D0340%26extras%3D" name="human readable name" password="some password">
+	<job id="1" use_gpu="1" archive_md5="db26b54689516484633b7d4855fb1567" path="compute-method.blend" frame="0340" synchronous_upload="1" validation_url="https%3A%2F%2Fsheepit-renderfarm.com%2Fserver%2Fsend_frame.php%3Fjob%3D1%26frame%3D0340" name="human readable name" password="some password">
 		<renderer md5="05234503229a4660e428e8d227746d8d" commandline=".e --factory-startup --disable-autoexec -noaudio -b .c --engine CYCLES -o .o -f .f -x 1" update_method="remainingtime"/>
 		<script>
 			<!-- a server generated python script configuring the render with the right settings for the farm -->
@@ -150,7 +150,6 @@ job => an element containing information about the new job
 		* path => The path to the blend file within the archive
 		* frame => The frame number to be rendered
 		* synchronous_upload => A flag indicating whether the job result can be queued up for uploading (0) or should be sent back immediately (1, only for the test frames)
-		* extras => Additional information, like whether the frame is a tile
 		* validation_url => The URL to send the job validation to
 		* name => The project name that will be displayed in the ui
 		* password => The archive password
@@ -170,7 +169,6 @@ Parameter as GET or POST:
     * job: Job ID
     * frame: Job's frame number
     * rendertime: Job's render time
-    * extras: Job's extra data
     * file: Frame to validate as form-data post
     * memoryused (optional): Max memory used for the render
     * cores (optional): Number of cores used from the render
@@ -195,7 +193,6 @@ Url: use the request type "keepmealive" from the configuration answer.
 Parameter as GET or POST:
     * job: ID of the rendering job
     * frame: Frame number of the rendering job
-    * extras: Extras data get on job request of the rendering job
     * rendertime: current render time (optional)
     * remainingtime: current remaining time to render the frame (optional)
 
@@ -242,7 +239,6 @@ Parameter as GET or POST:
 			* 99 => Unknown error
     * job: job ID
     * frame: job's frame number
-    * extras: job's extra data
     * render_time (optional): job's frame number
     * memoryused (optional): max memory used for the render (in kilo bytes)
 Parameter as form-urlencoded:

src/com/sheepit/client/Client.java

@@ -661,9 +661,6 @@ import okhttp3.HttpUrl;
 				remoteURL.addQueryParameter("job", job_to_reset_.getId());
 				remoteURL.addQueryParameter("render_time", Integer.toString(job_to_reset_.getProcessRender().getDuration()));
 				remoteURL.addQueryParameter("memoryused", Long.toString(job_to_reset_.getProcessRender().getPeakMemoryUsed()));
-				if (job_to_reset_.getExtras() != null && job_to_reset_.getExtras().isEmpty() == false) {
-					remoteURL.addQueryParameter("extras", job_to_reset_.getExtras());
-				}
 			}
 			this.server.HTTPSendFile(remoteURL.build().toString(), temp_file.getAbsolutePath(), step_, this.gui);
 			temp_file.delete();

src/com/sheepit/client/Job.java

@@ -68,7 +68,6 @@ import java.util.regex.Pattern;
 	private boolean useGPU;
 	private String name;
 	private char[] password;
-	private String extras;
 	private String updateRenderingStatusMethod;
 	private String blenderShortVersion;
 	private String blenderLongVersion;
@@ -82,7 +81,7 @@ import java.util.regex.Pattern;
 	private Log log;
 	
 	public Job(Configuration config_, Gui gui_, Log log_, String id_, String frame_, String path_, boolean use_gpu, String command_, String validationUrl_,
-			String script_, String sceneMd5_, String rendererMd5_, String name_, char[] password_, String extras_, boolean synchronous_upload_,
+			String script_, String sceneMd5_, String rendererMd5_, String name_, char[] password_, boolean synchronous_upload_,
 			String update_method_) {
 		configuration = config_;
 		id = id_;
@@ -95,7 +94,6 @@ import java.util.regex.Pattern;
 		rendererMD5 = rendererMd5_;
 		name = name_;
 		password = password_;
-		extras = extras_;
 		synchronousUpload = synchronous_upload_;
 		gui = gui_;
 		outputImagePath = null;
@@ -126,8 +124,8 @@ import java.util.regex.Pattern;
 	
 	public String toString() {
 		return String
-				.format("Job (numFrame '%s' sceneMD5 '%s' rendererMD5 '%s' ID '%s' pictureFilename '%s' jobPath '%s' gpu %s name '%s' extras '%s' updateRenderingStatusMethod '%s' render %s)",
-						frameNumber, sceneMD5, rendererMD5, id, outputImagePath, path, useGPU, name, extras, updateRenderingStatusMethod, render);
+				.format("Job (numFrame '%s' sceneMD5 '%s' rendererMD5 '%s' ID '%s' pictureFilename '%s' jobPath '%s' gpu %s name '%s' updateRenderingStatusMethod '%s' render %s)",
+						frameNumber, sceneMD5, rendererMD5, id, outputImagePath, path, useGPU, name, updateRenderingStatusMethod, render);
 	}
 	
 	public String getPrefixOutputImage() {

src/com/sheepit/client/Server.java

@@ -127,9 +127,6 @@ public class Server extends Thread {
 						Job job = this.client.getRenderingJob();
 						
 						urlBuilder.addQueryParameter("frame", job.getFrameNumber()).addQueryParameter("job", job.getId());
-						if (job.getExtras() != null && !job.getExtras().isEmpty()) {
-							urlBuilder.addQueryParameter("extras", job.getExtras());
-						}
 						
 						RenderProcess process = job.getProcessRender();
 						if (process != null) {
@@ -381,7 +378,7 @@ public class Server extends Thread {
 						jobData.getRenderTask().getFrame(), jobData.getRenderTask().getPath().replace("/", File.separator),
 						jobData.getRenderTask().getUseGpu() == 1, jobData.getRenderTask().getRendererInfos().getCommandline(), validationUrl,
 						jobData.getRenderTask().getScript(), jobData.getRenderTask().getArchive_md5(), jobData.getRenderTask().getRendererInfos().getMd5(),
-						jobData.getRenderTask().getName(), jobData.getRenderTask().getPassword(), jobData.getRenderTask().getExtras(),
+						jobData.getRenderTask().getName(), jobData.getRenderTask().getPassword(),
 						jobData.getRenderTask().getSynchronous_upload().equals("1"), jobData.getRenderTask().getRendererInfos().getUpdate_method());
 			}
 			else {

src/com/sheepit/client/datamodel/RenderTask.java

@@ -20,8 +20,6 @@ import org.simpleframework.xml.Root;
 	
 	@Attribute(name = "synchronous_upload") @Getter private String synchronous_upload;
 	
-	@Attribute(name = "extras") @Getter private String extras;
-	
 	@Attribute(name = "validation_url") @Getter private String validationUrl;
 	
 	@Attribute(name = "name") @Getter private String name;