From 2618da39b120e3cce7240d9eb88a63decb4359f4 Mon Sep 17 00:00:00 2001
From: Daniel Shiffman <daniel@shiffman.net>
Date: Thu, 14 Nov 2013 16:19:55 -0500
Subject: [PATCH] fixing up XML stuff for server

---
 .../java/{data => }/settings.xml              |  0
 .../java/src/mpe/server/MPEServer.java        | 25 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)
 rename Most-Pixels-Ever-Server/java/{data => }/settings.xml (100%)

diff --git a/Most-Pixels-Ever-Server/java/data/settings.xml b/Most-Pixels-Ever-Server/java/settings.xml
similarity index 100%
rename from Most-Pixels-Ever-Server/java/data/settings.xml
rename to Most-Pixels-Ever-Server/java/settings.xml
diff --git a/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java b/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java
index ca4839e..d106768 100644
--- a/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java
+++ b/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java
@@ -21,7 +21,7 @@
 import java.io.File;
 
 public class MPEServer {
-	
+
 	public static final String version = "2.0.2";
 
 	private HashMap<Integer,Connection> connectionlookup = new HashMap<Integer,Connection>();
@@ -50,8 +50,7 @@ public class MPEServer {
 
 	public boolean paused;
 
-	// TODO: What's the correct relative path for the default file?
-	public static final String defaultSettingsFile = "../data/settings.xml";
+	public static final String defaultSettingsFile = "settings.xml";
 
 	public void setFramerate(int fr){
 		if (fr > -1) frameRate = fr;
@@ -253,7 +252,7 @@ public void killServer() {
 	public static void main(String[] args) {
 
 		boolean help = false;
-		
+
 		System.out.println("MPE SERVER VERSION: " + version);
 
 		/*
@@ -290,10 +289,18 @@ else if (args[i].contains("-verbose")) {
 				runArgs.put("verbose", "1");
 			}
 			else if (args[i].contains("-xml")) {
-				String settingsFile = args[i].substring(4);
-				// Remove double quotes from the filename
-				settingsFile = settingsFile.replaceAll("^\"|\"$", "");
-				runArgs.put("xml", settingsFile);
+				try {
+					String settingsFile = args[i+1];
+					if (settingsFile.charAt(0) == '-') {
+						System.out.println("No filename specified, using " + defaultSettingsFile);
+						runArgs.put("xml", defaultSettingsFile);
+					}  else {
+						runArgs.put("xml", settingsFile);
+					}
+				} catch (Exception e) {
+					System.out.println("No filename specified, using " + defaultSettingsFile);
+					runArgs.put("xml", defaultSettingsFile);
+				}
 			}
 			else {
 				help = true;
@@ -338,7 +345,7 @@ else if (args[i].contains("-xml")) {
 					" * -framerate<framerate> Desired frame rate.  Defaults to 30\n" +
 					" * -port<port number> Defines the port.  Defaults to 9002\n" +
 					" * -verbose Turns debugging messages on.\n" +
-					" * -xml<path to file with XML settings>  Path to initialization file.  Defaults to \""+defaultSettingsFile+"\".\n");
+					" * -xml <path to file with XML settings>  Path to initialization file.  Defaults to \""+defaultSettingsFile+"\".\n");
 			System.exit(1);
 		}