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

Add headless toggle, useful for multi gpu on the same machine

Browse Source
This commit is contained in:
harlekin
2021-07-16 23:37:24 +00:00
committed by Sheepit Renderfarm
parent 6ca2067cbe
commit f94bba6e4c
7 changed files with 219 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/sheepit/client/SettingsLoader.java
View File

@@ -38,14 +38,15 @@ import com.sheepit.client.hardware.gpu.GPUDevice;
import com.sheepit.client.standalone.GuiSwing;
import com.sheepit.client.standalone.GuiText;
import com.sheepit.client.standalone.GuiTextOneLine;
import lombok.Setter;
import lombok.Data;
@Data
public class SettingsLoader {
private String path;
private String login;
@Setter private String password;
private String password;
private String proxy;
private String hostname;
@@ -58,6 +59,7 @@ public class SettingsLoader {
private String cacheDir;
private String autoSignIn;
private String useSysTray;
private String headless;
private String ui;
private String theme;
private int priority;
@@ -72,7 +74,7 @@ public class SettingsLoader {
}
public SettingsLoader(String path_, String login_, String password_, String proxy_, String hostname_, ComputeType computeMethod_, GPUDevice gpu_,
int renderbucketSize_, int cores_, long maxRam_, int maxRenderTime_, String cacheDir_, boolean autoSignIn_, boolean useSysTray_, String ui_,
int renderbucketSize_, int cores_, long maxRam_, int maxRenderTime_, String cacheDir_, boolean autoSignIn_, boolean useSysTray_, boolean isHeadless, String ui_,
String theme_, int priority_) {
if (path_ == null) {
path = getDefaultFilePath();
@@ -87,6 +89,7 @@ public class SettingsLoader {
cacheDir = cacheDir_;
autoSignIn = String.valueOf(autoSignIn_);
useSysTray = String.valueOf(useSysTray_);
headless = String.valueOf(isHeadless);
ui = ui_;
priority = priority_;
theme = theme_;
@@ -184,6 +187,10 @@ public class SettingsLoader {
prop.setProperty("use-systray", useSysTray);
}
if (headless != null) {
prop.setProperty("headless", headless);
}
if (ui != null) {
prop.setProperty("ui", ui);
}
@@ -295,6 +302,10 @@ public class SettingsLoader {
this.useSysTray = prop.getProperty("use-systray");
}
if (prop.containsKey("headless")) {
this.headless = prop.getProperty("headless");
}
if (prop.containsKey("ui")) {
this.ui = prop.getProperty("ui");
}
@@ -360,6 +371,10 @@ public class SettingsLoader {
config.setHostname(hostname);
}
if (!config.isHeadless() && headless != null) {
config.setHeadless(Boolean.parseBoolean(headless));
}
if (config.getPriority() == 19) { // 19 is default value
config.setUsePriority(priority);
}
@@ -471,6 +486,7 @@ public class SettingsLoader {
this.cacheDir = null;
this.autoSignIn = null;
this.useSysTray = String.valueOf(defaultConfigValues.isUseSysTray());
this.headless = String.valueOf(defaultConfigValues.isHeadless());
this.ui = null;
this.priority = defaultConfigValues.getPriority(); // must be the same default as Configuration
this.ram = null;
@@ -483,7 +499,7 @@ public class SettingsLoader {
@Override public String toString() {
return String.format(
"SettingsLoader [path=%s, login=%s, password=%s, computeMethod=%s, gpu=%s, renderbucket-size=%s, cacheDir=%s, theme=%s, priority=%d, autosign=%s, usetray=%s]",
path, login, password, computeMethod, gpu, renderbucketSize, cacheDir, theme, priority, autoSignIn, useSysTray);
"SettingsLoader [path=%s, login=%s, password=%s, computeMethod=%s, gpu=%s, renderbucket-size=%s, cacheDir=%s, theme=%s, priority=%d, autosign=%s, usetray=%s, headless=%s]",
path, login, password, computeMethod, gpu, renderbucketSize, cacheDir, theme, priority, autoSignIn, useSysTray, headless);
}
}