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

Ref: use ok3http library to build the url query string

Browse Source
This commit is contained in:
Bryan Stenson
2021-09-09 21:29:00 +02:00
committed by Sheepit Renderfarm
parent d90a689f27
commit ec91bb9e1e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,7 @@ import com.sheepit.client.os.OS;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import okhttp3.HttpUrl;
@Data public class Client { @Data public class Client {
private Gui gui; private Gui gui;
@@ -650,15 +651,18 @@ import lombok.Data;
} }
writer.close(); writer.close();
String args = "?type=" + (error == null ? "" : error.getValue()); HttpUrl.Builder remoteURL = HttpUrl.parse(this.server.getPage("error")).newBuilder();
remoteURL.addQueryParameter("type", error == null ? "" : Integer.toString(error.getValue()));
if (job_to_reset_ != null) { if (job_to_reset_ != null) {
args += "&frame=" + job_to_reset_.getFrameNumber() + "&job=" + job_to_reset_.getId() + "&render_time=" + job_to_reset_.getProcessRender() remoteURL.addQueryParameter("frame", job_to_reset_.getFrameNumber());
.getDuration() + "&memoryused=" + job_to_reset_.getProcessRender().getMemoryUsed(); 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().getMemoryUsed()));
if (job_to_reset_.getExtras() != null && job_to_reset_.getExtras().isEmpty() == false) { if (job_to_reset_.getExtras() != null && job_to_reset_.getExtras().isEmpty() == false) {
args += "&extras=" + job_to_reset_.getExtras(); remoteURL.addQueryParameter("extras", job_to_reset_.getExtras());
} }
} }
this.server.HTTPSendFile(this.server.getPage("error") + args, temp_file.getAbsolutePath(), step_, this.gui); this.server.HTTPSendFile(remoteURL.build().toString(), temp_file.getAbsolutePath(), step_, this.gui);
temp_file.delete(); temp_file.delete();
} }
catch (Exception e) { catch (Exception e) {