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

Move SettingsLoader to a better place

Browse Source
This commit is contained in:
Laurent Clouet
2015-04-08 20:45:54 +01:00
parent ca221ddc8b
commit 97de741c06
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sheepit/client/standalone/Worker.java
View File

@@ -38,11 +38,11 @@ import com.sheepit.client.Configuration.ComputeType;
import com.sheepit.client.Gui;
import com.sheepit.client.Log;
import com.sheepit.client.Pair;
import com.sheepit.client.SettingsLoader;
import com.sheepit.client.ShutdownHook;
import com.sheepit.client.hardware.gpu.GPU;
import com.sheepit.client.hardware.gpu.GPUDevice;
import com.sheepit.client.network.ProxyAuthenticator;
import com.sheepit.client.standalone.swing.SettingsLoader;
public class Worker {
@Option(name = "-server", usage = "Render-farm server, default https://www.sheepit-renderfarm.com", metaVar = "URL", required = false)

225
src/com/sheepit/client/standalone/swing/SettingsLoader.java
View File

@@ -1,225 +0,0 @@
package com.sheepit.client.standalone.swing;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Properties;
import com.sheepit.client.Configuration;
import com.sheepit.client.Configuration.ComputeType;
import com.sheepit.client.hardware.gpu.GPU;
import com.sheepit.client.hardware.gpu.GPUDevice;
public class SettingsLoader {
private String path;
private String login;
private String password;
private String computeMethod;
private String gpu;
private String cacheDir;
private String autoSignIn;
private String ui;
public SettingsLoader() {
path = getDefaultFilePath();
}
public SettingsLoader(String path_) {
path = path_;
}
public SettingsLoader(String login_, String password_, ComputeType computeMethod_, GPUDevice gpu_, String cacheDir_, boolean autoSignIn_, String ui_) {
path = getDefaultFilePath();
login = login_;
password = password_;
cacheDir = cacheDir_;
autoSignIn = String.valueOf(autoSignIn_);
ui = ui_;
if (computeMethod_ != null) {
try {
computeMethod = computeMethod_.name();
}
catch (IllegalArgumentException e) {
}
}
if (gpu_ != null) {
gpu = gpu_.getCudaName();
}
}
public static String getDefaultFilePath() {
return System.getProperty("user.home") + File.separator + ".sheepit.conf";
}
public String getFilePath() {
return path;
}
public void saveFile() {
Properties prop = new Properties();
OutputStream output = null;
try {
output = new FileOutputStream(path);
if (cacheDir != null) {
prop.setProperty("cache-dir", cacheDir);
}
if (computeMethod != null) {
prop.setProperty("compute-method", computeMethod);
}
if (gpu != null) {
prop.setProperty("compute-gpu", gpu);
}
if (login != null) {
prop.setProperty("login", login);
}
if (password != null) {
prop.setProperty("password", password);
}
if (autoSignIn != null) {
prop.setProperty("auto-signin", autoSignIn);
}
if (ui != null) {
prop.setProperty("ui", ui);
}
prop.store(output, null);
}
catch (IOException io) {
io.printStackTrace();
}
finally {
if (output != null) {
try {
output.close();
}
catch (IOException e) {
e.printStackTrace();
}
}
}
}
public void loadFile() {
this.login = null;
this.password = null;
this.computeMethod = null;
this.gpu = null;
this.cacheDir = null;
this.autoSignIn = null;
this.ui = null;
if (new File(path).exists() == false) {
return;
}
Properties prop = new Properties();
InputStream input = null;
try {
input = new FileInputStream(path);
prop.load(input);
if (prop.containsKey("cache-dir")) {
this.cacheDir = prop.getProperty("cache-dir");
}
if (prop.containsKey("compute-method")) {
this.computeMethod = prop.getProperty("compute-method");
}
if (prop.containsKey("compute-gpu")) {
this.gpu = prop.getProperty("compute-gpu");
}
if (prop.containsKey("login")) {
this.login = prop.getProperty("login");
}
if (prop.containsKey("password")) {
this.password = prop.getProperty("password");
}
if (prop.containsKey("auto-signin")) {
this.autoSignIn = prop.getProperty("auto-signin");
}
if (prop.containsKey("ui")) {
this.ui = prop.getProperty("ui");
}
}
catch (IOException io) {
io.printStackTrace();
}
finally {
if (input != null) {
try {
input.close();
}
catch (IOException e) {
e.printStackTrace();
}
}
}
}
/**
* Merge the Settings file with the Configuration.
* The Configuration will have high priority.
*/
public void merge(Configuration config) {
if (config == null) {
System.out.println("SettingsLoader::merge config is null");
}
loadFile();
if (config.login().isEmpty() && login != null) {
config.setLogin(login);
}
if (config.password().isEmpty() && password != null) {
config.setPassword(password);
}
try {
if ((config.getComputeMethod() == null && computeMethod != null) || (computeMethod != null && config.getComputeMethod() != ComputeType.valueOf(computeMethod))) {
config.setComputeMethod(ComputeType.valueOf(computeMethod));
}
}
catch (IllegalArgumentException e) {
System.err.println("SettingsLoader::merge failed to handle compute method (raw value: '" + computeMethod + "')");
computeMethod = null;
}
if (config.getGPUDevice() == null && gpu != null) {
GPUDevice device = GPU.getGPUDevice(gpu);
if (device != null) {
config.setUseGPU(device);
}
}
if (config.getUserSpecifiedACacheDir() == false && cacheDir != null) {
config.setCacheDir(new File(cacheDir));
}
if (config.getUIType() == null && ui != null) {
config.setUIType(ui);
}
config.setAutoSignIn(Boolean.valueOf(autoSignIn));
}
@Override
public String toString() {
return "ConfigurationLoader [path=" + path + ", login=" + login + ", password=" + password + ", computeMethod=" + computeMethod + ", gpu=" + gpu + ", cacheDir=" + cacheDir + "]";
}
}

2
src/com/sheepit/client/standalone/swing/activity/Settings.java
View File

@@ -19,10 +19,10 @@ import javax.swing.JPasswordField;
import javax.swing.JTextField;
import com.sheepit.client.Configuration;
import com.sheepit.client.Configuration.ComputeType;
import com.sheepit.client.SettingsLoader;
import com.sheepit.client.hardware.gpu.GPU;
import com.sheepit.client.hardware.gpu.GPUDevice;
import com.sheepit.client.standalone.GuiSwing;
import com.sheepit.client.standalone.swing.SettingsLoader;
public class Settings implements Activity {
private static final String DUMMY_CACHE_DIR = "Auto detected";