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

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

@@ -25,9 +25,7 @@ import static org.kohsuke.args4j.ExampleMode.REQUIRED;
import org.kohsuke.args4j.Option;
import java.io.File;
import java.net.Authenticator;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -42,7 +40,7 @@ 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.network.Proxy;
public class Worker {
@Option(name = "-server", usage = "Render-farm server, default https://www.sheepit-renderfarm.com", metaVar = "URL", required = false)
@@ -209,25 +207,7 @@ public class Worker {
if (proxy != null) {
try {
URL url = new URL(proxy);
String userinfo = url.getUserInfo();
if (userinfo != null) {
String[] elements = userinfo.split(":");
if (elements.length == 2) {
String proxy_user = elements[0];
String proxy_password = elements[1];
if (proxy_user != null && proxy_password != null) {
Authenticator.setDefault(new ProxyAuthenticator(proxy_user, proxy_password));
}
}
}
System.setProperty("http.proxyHost", url.getHost());
System.setProperty("http.proxyPort", Integer.toString(url.getPort()));
System.setProperty("https.proxyHost", url.getHost());
System.setProperty("https.proxyPort", Integer.toString(url.getPort()));
Proxy.set(proxy);
}
catch (MalformedURLException e) {
System.err.println("Error: wrong url for proxy");

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

@@ -5,6 +5,7 @@ import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.io.File;
import java.net.MalformedURLException;
import java.util.LinkedList;
import java.util.List;
@@ -23,6 +24,7 @@ import com.sheepit.client.SettingsLoader;
import com.sheepit.client.hardware.cpu.CPU;
import com.sheepit.client.hardware.gpu.GPU;
import com.sheepit.client.hardware.gpu.GPUDevice;
import com.sheepit.client.network.Proxy;
import com.sheepit.client.standalone.GuiSwing;
public class Settings implements Activity {
@@ -38,6 +40,7 @@ public class Settings implements Activity {
private JCheckBox useCPU;
private List<JCheckBoxGPU> useGPUs;
private JSlider cpuCores;
private JTextField proxy;
private JCheckBox saveFile;
private JCheckBox autoSignIn;
@@ -61,8 +64,8 @@ public class Settings implements Activity {
int start_label_left = 109;
int start_label_right = 265;
int end_label_right = 490;
int n = 10;
int sep = 45;
int n = 5;
int sep = 40;
ImageIcon image = new ImageIcon(getClass().getResource("/title.png"));
JLabel labelImage = new JLabel(image);
@@ -70,7 +73,7 @@ public class Settings implements Activity {
n = labelImage.getHeight();
parent.getContentPane().add(labelImage);
n += 40;
n += sep;
JLabel loginLabel = new JLabel("Login:");
loginLabel.setBounds(start_label_left, n, 170, size_height_label);
@@ -98,6 +101,21 @@ public class Settings implements Activity {
n += sep;
JLabel proxyLabel = new JLabel("Proxy:");
proxyLabel.setBounds(start_label_left, n, 170, size_height_label);
proxyLabel.setToolTipText("http://login:password@host:port");
parent.getContentPane().add(proxyLabel);
proxy = new JTextField();
proxy.setBounds(start_label_right, n, end_label_right - start_label_right, size_height_label);
proxy.setToolTipText("http://login:password@host:port");
System.out.println("parent.getConfiguration().getProxy() " + parent.getConfiguration().getProxy());
proxy.setText(parent.getConfiguration().getProxy());
proxy.addKeyListener(new CheckCanStart());
parent.getContentPane().add(proxy);
n += sep;
JLabel cacheLabel = new JLabel("Working directory:");
cacheLabel.setBounds(start_label_left, n, 240, size_height_label);
parent.getContentPane().add(cacheLabel);
@@ -215,7 +233,7 @@ public class Settings implements Activity {
selected = true;
}
}
if (login.getText().isEmpty() || password.getPassword().length == 0) {
if (login.getText().isEmpty() || password.getPassword().length == 0 || Proxy.isValidURL(proxy.getText()) == false) {
selected = false;
}
saveButton.setEnabled(selected);
@@ -322,6 +340,19 @@ public class Settings implements Activity {
config.setUseNbCores(cpu_cores);
}
String proxyText = null;
if (proxy != null) {
try {
Proxy.set(proxy.getText());
proxyText = proxy.getText();
}
catch (MalformedURLException e1) {
System.err.println("Error: wrong url for proxy");
System.err.println(e);
System.exit(2);
}
}
parent.setCredentials(login.getText(), new String(password.getPassword()));
String cachePath = null;
@@ -330,7 +361,7 @@ public class Settings implements Activity {
}
if (saveFile.isSelected()) {
new SettingsLoader(login.getText(), new String(password.getPassword()), method, selected_gpu, cpu_cores, cachePath, autoSignIn.isSelected(), GuiSwing.type).saveFile();
new SettingsLoader(login.getText(), new String(password.getPassword()), proxyText, method, selected_gpu, cpu_cores, cachePath, autoSignIn.isSelected(), GuiSwing.type).saveFile();
}
else {
try {