updated console commands

request handler standard

src/it/ksuploader/main/KSUploaderServer.java

@@ -23,6 +23,7 @@ public static void main(String[] args) {
 			FileHandler loggerFileHandler = new FileHandler("./KSULog.txt", 10000000, 1, true);
 			loggerFileHandler.setFormatter(new LogFormatter());
 			loggerFileHandler.setLevel(Level.FINEST);
+			logger.setUseParentHandlers(false);
 
 			logger.addHandler(loggerFileHandler);
 
@@ -88,10 +89,9 @@ private static void bootstrap(String[] args) throws Exception {
 		} else {
 			if (
 					KSUploaderServer.config.getFolder().equals("") ||
-					KSUploaderServer.config.getPass().equals("") ||
-					Integer.toString(KSUploaderServer.config.getPort()).equals("") ||
-					KSUploaderServer.config.getWebUrl().equals(""))
-			{
+							KSUploaderServer.config.getPass().equals("") ||
+							Integer.toString(KSUploaderServer.config.getPort()).equals("") ||
+							KSUploaderServer.config.getWebUrl().equals("")) {
 				throw new Exception("Error reading config properties.");
 			} else {
 				System.out.println("Password: " + KSUploaderServer.config.getPass());
@@ -107,12 +107,31 @@ private static void bootstrap(String[] args) throws Exception {
 	private static void console() {
 		String cmd = "";
 		BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-		while (!cmd.equals("stop")) {
+		while (!cmd.equals("shutdown")) {
 			try {
 				cmd = in.readLine();
 				switch (cmd.split(" ")[0]) {
-					case "changepassword":
-						config.setPass(cmd.split(" ")[1]);
+					case "change-password":
+						if (config.setPass(cmd.split(" ")[1])) {
+							System.out.println("Password changed.");
+						} else {
+							System.out.println("Error.");
+						}
+						break;
+					case "get-password":
+						System.out.println(config.getPass());
+						break;
+					case "help":
+					case "?":
+						System.out.println("change-password <pass> - Change the server password");
+						System.out.println("get-password - Print current password");
+						System.out.println("shutdown - Stop the server");
+						break;
+					case "shutdown":
+						System.out.println("Shutting down...");
+						break;
+					default:
+						System.out.println("Invalid command.");
 						break;
 				}
 			} catch (IOException e) {

src/it/ksuploader/main/Listener.java

@@ -41,7 +41,6 @@ public void run() {
 		while (this.listen) {
 			try {
 				new RequestHandler(this.serverSocketChannel.accept()).start();
-				System.out.println("--------------------------------------------------------------------------------");
 			} catch (IOException e) {
 				this.logger.log(Level.WARNING, "Error during handling request", e);
 			}

src/it/ksuploader/main/RequestHandler.java

@@ -51,9 +51,9 @@ public void run() {
 			this.input = new DataInputStream(socketChannel.socket().getInputStream());
 			this.output = new DataOutputStream(socketChannel.socket().getOutputStream());
 
-			// Syn string (password|fileLength|fileType)
+			// Syn string (password&fileLength&fileType)
 			this.logger.log(Level.INFO, "Waiting SYN");
-			String synInfo[] = input.readUTF().split("\\|");
+			String synInfo[] = input.readUTF().split("&");
 
 			// check correct SYN
 			if (synInfo.length != 3) {
@@ -105,8 +105,8 @@ public void run() {
 			this.output.writeUTF(Messages.OK.name());
 
 			// set file name
-			String fileName = new SimpleDateFormat("EEE-MMM-yyyy-hh-mm-ss-SSS").format(Calendar.getInstance().getTime());
-			fileName = fileName + "-" + new Random().nextInt(999999);
+			String fileName = new SimpleDateFormat("ddMMyy-HHmmssSS").format(Calendar.getInstance().getTime());
+			fileName = new Random().nextInt(9999) + "-" + fileName;
 
 			this.logger.log(Level.FINE, "Transfer started.");
 
@@ -115,11 +115,12 @@ public void run() {
 
 			boolean ret = readFromSocket(new File(KSUploaderServer.config.getFolder() + File.separator + fileName + format), flength);
 
-			this.logger.log(Level.FINE, "Transfer Ended.");
+			this.logger.log(Level.FINE, "Transfer ended.");
 
 			// return URL
 			if (ret) {
 				this.output.writeUTF(KSUploaderServer.config.getWebUrl() + fileName + format);
+				this.logger.log(Level.FINE, "Returned link -> " + KSUploaderServer.config.getWebUrl() + fileName + format);
 			} else {
 				this.output.writeUTF(Messages.UNKNOWN_ERROR.name());
 			}