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

Fix: download progress indicator jumping back and forth

Browse Source
This commit is contained in:
Sheepit Renderfarm
2024-11-20 16:57:43 +00:00
parent 8d7a29cf7f
commit 3d4c9a0487
7 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/sheepit/client/Server.java
View File

@@ -395,12 +395,22 @@ public class Server extends Thread {
}
String validationUrl = URLDecoder.decode(jobData.getRenderTask().getValidationUrl(), "UTF-8");
DownloadItem projectDownload = new DownloadItem(
jobData.getRenderTask().getChunks(),
jobData.getRenderTask().getSize(),
jobData.getRenderTask().getMd5());
DownloadItem rendererDownload = new DownloadItem(
jobData.getRenderTask().getRendererInfos().getChunks(),
jobData.getRenderTask().getRendererInfos().getSize(),
jobData.getRenderTask().getRendererInfos().getMd5());
return new Job(this.user_config, this.client.getGui(), this.client.getLog(), jobData.getRenderTask().getId(),
jobData.getRenderTask().getFrame(), jobData.getRenderTask().getPath().replace("/", File.separator),
jobData.getRenderTask().getUseGpu() == 1, jobData.getRenderTask().getRendererInfos().getCommandline(), validationUrl,
jobData.getRenderTask().getScript(), jobData.getRenderTask().getChunks(), jobData.getRenderTask().getRendererInfos().getMd5(),
jobData.getRenderTask().getRendererInfos().getChunks(), jobData.getRenderTask().getName(), jobData.getRenderTask().getPassword(),
jobData.getRenderTask().getScript(), projectDownload, rendererDownload,
jobData.getRenderTask().getName(), jobData.getRenderTask().getPassword(),
"1".equals(jobData.getRenderTask().getSynchronousUpload()), jobData.getRenderTask().getRendererInfos().getUpdateMethod());
}
catch (SheepItException e) {
@@ -508,10 +518,6 @@ public class Server extends Thread {
int len;
long written = 0;
if (size != -1) {
gui_.getDownloadProgress().addTotal(size);
}
this.log.debug("Downloading file from " + response.request().url().host());
LocalDateTime startRequestTime = LocalDateTime.now();