#65 Add silent running for client

Author: iessa-pragg-ctct

gradle.properties

@@ -1,2 +1,2 @@
-ssversion = 2.6.12
+ssversion = 2.6.13
 ssname = serversync

src/main/java/com/superzanti/lib/RefStrings.java

@@ -7,5 +7,5 @@
 public class RefStrings {
 	public static final String MODID = "serversync";
 	public static final String NAME = "Server Sync";
-	public static final String VERSION = "2.6.12";
+	public static final String VERSION = "2.6.13";
 }

src/main/java/com/superzanti/serversync/gui/GUI_Client.java

@@ -16,6 +16,7 @@
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
@@ -31,6 +32,8 @@
 import javax.swing.border.TitledBorder;
 
 import com.superzanti.lib.RefStrings;
+import com.superzanti.serversync.ClientWorker;
+import com.superzanti.serversync.SyncConfig;
 
 import runme.Main;
 
@@ -182,6 +185,44 @@ public void keyPressed(java.awt.event.KeyEvent e) {
 				return;
 			}
 		});
+		
+		B_sync.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				int port = getPort();
+				String ip = getIPAddress();
+				boolean error = false;
+				
+				if (ip.equals("") || port == 90000) {
+					updateText("No config found, requesting details");
+					
+					if (ip.equals("")) {
+						String serverIP = (String) JOptionPane.showInputDialog("Server IP address");
+						ip = serverIP;
+						setIPAddress(ip);
+					}
+					
+					if (port == 90000) {
+						String serverPort = (String) JOptionPane.showInputDialog("Server Port (numbers only)");
+						port = Integer.parseInt(serverPort);
+						
+						if(setPort(port)) {
+							error = true;
+						}
+					}
+					
+					SyncConfig.pullServerConfig = true;
+				}
+				
+				if (!error) {
+					Main.CONFIG.SERVER_IP = ip;
+					Main.CONFIG.SERVER_PORT = port;
+					updateText("Starting update process...");
+					new Thread(new ClientWorker()).start();
+				}
+			}
+		});
 	}
 
 	public void build(Locale loc) {

src/main/java/com/superzanti/serversync/util/ProgramArguments.java

@@ -0,0 +1,18 @@
+package com.superzanti.serversync.util;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ProgramArguments {
+	
+	public final boolean isServer;
+	public final boolean syncSilent;
+	public final boolean syncProgressOnly;
+	
+	public ProgramArguments(String[] arguments) {
+		List<String> args = Arrays.asList(arguments);
+		this.isServer = args.contains("server");
+		this.syncSilent = args.contains("silent");
+		this.syncProgressOnly = args.contains("progress-only");
+	}
+}

src/main/java/runme/Main.java

@@ -5,15 +5,14 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
 import com.superzanti.serversync.ClientWorker;
 import com.superzanti.serversync.ServerSetup;
 import com.superzanti.serversync.SyncConfig;
 import com.superzanti.serversync.gui.GUI_Client;
-import com.superzanti.serversync.gui.GUI_Client.SyncPressedListener;
 import com.superzanti.serversync.gui.GUI_Server;
+import com.superzanti.serversync.util.ProgramArguments;
 import com.superzanti.serversync.util.enums.EConfigType;
 
 
@@ -31,9 +30,13 @@ public class Main {
 
 	public static SyncConfig CONFIG;
 
+	public static ProgramArguments arguments;
+	
 
 	public static void main(String[] args) throws InterruptedException, IOException {
+		arguments = new ProgramArguments(args);
 		CONFIG = new SyncConfig(EConfigType.COMMON);
+		
 		try {
 			// TODO left off here, fix locale use and other main references
 			System.out.println("Loading language file: " + CONFIG.LOCALE);
@@ -48,16 +51,10 @@ public void run() {
 			strings = ResourceBundle.getBundle("assets.serversync.lang.MessagesBundle", new Locale("en", "US"));
 		}
 
-		if (args == null || args.length == 0) {
+		if (arguments.isServer) {
+			runInServerMode();
+		} else {
 			runInClientMode();
-			return;
-		}
-		
-		for (String string : args) {
-			switch(string) {
-				case "server":
-					runInServerMode();
-			}
 		}
 	}
 
@@ -70,49 +67,31 @@ private static void runInServerMode() {
 
 	private static void runInClientMode() {
 		CONFIG = new SyncConfig(EConfigType.CLIENT);
-		
-		clientGUI = new GUI_Client();
-		
-		clientGUI.setSyncPressedListener(new SyncPressedListener() {
+		Thread clientThread;
+		if (arguments.syncSilent) {			
+			new Thread(new ClientWorker()).start();
+		} else if (arguments.syncProgressOnly) {
+			//TODO setup a progress only version of the GUI
+			clientGUI = new GUI_Client();
+			clientGUI.setIPAddress(CONFIG.SERVER_IP);
+			clientGUI.setPort(CONFIG.SERVER_PORT);
+			clientGUI.build(CONFIG.LOCALE);
 
-			@Override
-			public void onSyncPressed() {
-				int port = clientGUI.getPort();
-				String ip = clientGUI.getIPAddress();
-				boolean error = false;
-				
-				if (ip.equals("") || port == 90000) {
-					clientGUI.updateText("No config found, requesting details");
-					
-					if (ip.equals("")) {
-						String serverIP = (String) JOptionPane.showInputDialog("Server IP address");
-						ip = serverIP;
-						clientGUI.setIPAddress(ip);
-					}
-					
-					if (port == 90000) {
-						String serverPort = (String) JOptionPane.showInputDialog("Server Port (numbers only)");
-						port = Integer.parseInt(serverPort);
-						
-						if(clientGUI.setPort(port)) {
-							error = true;
-						}
-					}
-					
-					SyncConfig.pullServerConfig = true;
-				}
-				
-				if (!error) {
-					CONFIG.SERVER_IP = ip;
-					CONFIG.SERVER_PORT = port;
-					clientGUI.updateText("Starting update process...");
-					new Thread(new ClientWorker()).start();
-				}
+			clientThread = new Thread(new ClientWorker());
+			clientThread.start();
+			try {
+				clientThread.join();
+			} catch (InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				System.exit(1);
 			}
-		});
-		System.out.println(CONFIG.SERVER_PORT);
-		clientGUI.setIPAddress(CONFIG.SERVER_IP);
-		clientGUI.setPort(CONFIG.SERVER_PORT);
-		clientGUI.build(CONFIG.LOCALE);
+			System.exit(0);
+		} else {			
+			clientGUI = new GUI_Client();
+			clientGUI.setIPAddress(CONFIG.SERVER_IP);
+			clientGUI.setPort(CONFIG.SERVER_PORT);
+			clientGUI.build(CONFIG.LOCALE);
+		}
 	}
 }