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

Merge branch 'ref/directory-manager' into 'master'

Browse Source 
Ref: move directories handle to a specific class (outside of Client class)

See merge request sheepitrenderfarm/client!280
This commit is contained in:
Sheepit Renderfarm
2023-12-19 14:35:24 +00:00
parent 119f3b0b2a 3e850ad6e5
commit 8c2360adb1
3 changed files with 123 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/sheepit/client/Job.java
View File

@@ -147,32 +147,10 @@ import java.util.regex.Pattern;
return configuration.getWorkingDirectory().getAbsolutePath() + File.separator + rendererMD5;
}
public String getRequiredRendererArchivePath() {
if (configuration.getSharedDownloadsDirectory() != null) {
return configuration.getSharedDownloadsDirectory().getAbsolutePath() + File.separator + rendererMD5 + ".zip";
}
else {
return getRendererArchivePath();
}
}
public String getRendererPath() {
return getRendererDirectory() + File.separator + OS.getOS().getRenderBinaryPath();
}
public String getRendererArchivePath() {
return configuration.getStorageDir().getAbsolutePath() + File.separator + rendererMD5 + ".zip";
}
public String getRequiredProjectChunkPath(String chunk) {
if (configuration.getSharedDownloadsDirectory() != null) {
return configuration.getSharedDownloadsDirectory().getAbsolutePath() + File.separator + chunk + ".wool";
}
else {
return getSceneArchiveChunkPath(chunk);
}
}
public String getSceneDirectory() {
return configuration.getWorkingDirectory().getAbsolutePath() + File.separator + this.id;
}
@@ -181,10 +159,6 @@ import java.util.regex.Pattern;
return getSceneDirectory() + File.separator + this.path;
}
public String getSceneArchiveChunkPath(String chunk) {
return configuration.getWorkingDirectory().getAbsolutePath() + File.separator + chunk + ".wool";
}
public Error.Type render(Observer renderStarted) {
gui.status("Rendering");
RenderProcess process = getProcessRender();