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

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

Browse Source
This commit is contained in:
Sheepit Renderfarm
2022-03-08 16:01:27 +00:00
parent f6acb34d2c
commit 27d2e149af
5 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();

8
src/com/sheepit/client/Job.java
View File

@@ -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() {

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

@@ -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 {

2
src/com/sheepit/client/datamodel/RenderTask.java
View File

@@ -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;