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

Add proxy info to conf file and swing ui

Browse Source
This commit is contained in:
Laurent Clouet
2015-07-06 18:41:28 +01:00
parent be4b8969ba
commit a0daf5e262
5 changed files with 135 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ public class SettingsLoader {
private String login;
private String password;
private String proxy;
private String computeMethod;
private String gpu;
private String cores;
@@ -38,10 +39,11 @@ public class SettingsLoader {
path = path_;
}
public SettingsLoader(String login_, String password_, ComputeType computeMethod_, GPUDevice gpu_, int cores_, String cacheDir_, boolean autoSignIn_, String ui_) {
public SettingsLoader(String login_, String password_, String proxy_, ComputeType computeMethod_, GPUDevice gpu_, int cores_, String cacheDir_, boolean autoSignIn_, String ui_) {
path = getDefaultFilePath();
login = login_;
password = password_;
proxy = proxy_;
cacheDir = cacheDir_;
autoSignIn = String.valueOf(autoSignIn_);
ui = ui_;
@@ -100,6 +102,10 @@ public class SettingsLoader {
prop.setProperty("password", password);
}
if (proxy != null) {
prop.setProperty("proxy", proxy);
}
if (autoSignIn != null) {
prop.setProperty("auto-signin", autoSignIn);
}
@@ -143,6 +149,7 @@ public class SettingsLoader {
public void loadFile() {
this.login = null;
this.password = null;
this.proxy = null;
this.computeMethod = null;
this.gpu = null;
this.cacheDir = null;
@@ -183,6 +190,10 @@ public class SettingsLoader {
this.password = prop.getProperty("password");
}
if (prop.containsKey("proxy")) {
this.proxy = prop.getProperty("proxy");
}
if (prop.containsKey("auto-signin")) {
this.autoSignIn = prop.getProperty("auto-signin");
}
@@ -224,6 +235,10 @@ public class SettingsLoader {
config.setPassword(password);
}
if ((config.getProxy() == null || config.getProxy().isEmpty()) && proxy != null) {
config.setProxy(proxy);
}
try {
if ((config.getComputeMethod() == null && computeMethod != null) || (computeMethod != null && config.getComputeMethod() != ComputeType.valueOf(computeMethod))) {
config.setComputeMethod(ComputeType.valueOf(computeMethod));