From 7b693a8f36b6cf7cfef54cae86bdcefeb58f7b68 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Sun, 15 Sep 2019 21:34:16 +0200 Subject: [PATCH] Save config file --- src/com/sheepit/client/Server.java | 4 ++++ src/com/sheepit/client/standalone/GuiSwing.java | 2 ++ .../sheepit/client/standalone/swing/activity/Settings.java | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java index e1e8008..1087b42 100644 --- a/src/com/sheepit/client/Server.java +++ b/src/com/sheepit/client/Server.java @@ -63,6 +63,7 @@ import com.sheepit.client.datamodel.HeartBeatInfos; import com.sheepit.client.datamodel.JobInfos; import com.sheepit.client.datamodel.JobValidation; import com.sheepit.client.datamodel.ServerConfig; +import lombok.Getter; import org.simpleframework.xml.core.Persister; import com.sheepit.client.Configuration.ComputeType; @@ -81,7 +82,10 @@ import com.sheepit.client.os.OS; public class Server extends Thread implements HostnameVerifier, X509TrustManager { private String base_url; + + @Getter private ServerConfig serverConfig; + private Configuration user_config; private Client client; private Log log; diff --git a/src/com/sheepit/client/standalone/GuiSwing.java b/src/com/sheepit/client/standalone/GuiSwing.java index 28996de..3d518fe 100644 --- a/src/com/sheepit/client/standalone/GuiSwing.java +++ b/src/com/sheepit/client/standalone/GuiSwing.java @@ -49,6 +49,7 @@ import com.sheepit.client.SettingsLoader; import com.sheepit.client.Stats; import com.sheepit.client.standalone.swing.activity.Settings; import com.sheepit.client.standalone.swing.activity.Working; +import lombok.Getter; import lombok.Setter; public class GuiSwing extends JFrame implements Gui { @@ -71,6 +72,7 @@ public class GuiSwing extends JFrame implements Gui { private boolean waitingForAuthentication; private Client client; + @Getter @Setter private SettingsLoader settingsLoader; diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/com/sheepit/client/standalone/swing/activity/Settings.java index 4537633..55fc4de 100644 --- a/src/com/sheepit/client/standalone/swing/activity/Settings.java +++ b/src/com/sheepit/client/standalone/swing/activity/Settings.java @@ -551,6 +551,12 @@ public class Settings implements Activity { if (saveFile.isSelected()) { parent.setSettingsLoader(new SettingsLoader(config.getConfigFilePath(), login.getText(), new String(password.getPassword()), proxyText, hostnameText, method, selected_gpu, cpu_cores, max_ram, max_rendertime, cachePath, autoSignIn.isSelected(), GuiSwing.type, priority.getValue())); + + // wait for successful authentication (to store the public key) + // or do we already have one? + if (parent.getClient().getServer().getServerConfig() != null && parent.getClient().getServer().getServerConfig().getPublickey() != null) { + parent.getSettingsLoader().saveFile(); + } } } }