Add files via upload

Added GUI

Author: DevKevYT

com/devkev/devscript/raw/ApplicationInput.java

@@ -25,7 +25,6 @@ public int read() throws IOException {
 		}
 		index++;
 		if(index < data.length() && !data.isEmpty()) {
-			System.out.println("Fetching data... " + data.getBytes()[index-1]);
 			return data.getBytes()[index-1];
 		} else {
 			inputReqested = false;

com/devkev/devscript/raw/ConsoleMain.java

@@ -14,42 +14,80 @@
  * -f or --file [path] - Reads the file and executes the code from it.<br>
  * If no argument was passed, the default Editor GUI will open.*/
 public class ConsoleMain {
+	
+	/*Argument schema: -f <string> -e <string> --nogui </>
+	 * When nogui is not given, the gui program will start with the given script from the command line
+	 * */
+	
 	public static void main(String[] args) throws IOException {
-		Process p = new Process(true);
-		p.addSystemOutput();
-		p.setInput(System.in);
-
-		if(args.length == 0) {
-			if(ConsoleMain.class.getResourceAsStream("/Editor.txt") == null) {
-				System.err.println("Editor file is missing at: " + URLDecoder.decode(ConsoleMain.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"));
-				return;
-			}
-			BufferedReader reader = new BufferedReader(new InputStreamReader(ConsoleMain.class.getResourceAsStream("/Editor.txt")));
-			String code  = "";
-			String line = reader.readLine();
-			while(line != null) {
-				code += line;
-				line = reader.readLine();
+		boolean initGUI = true;
+		String scriptToExecute = null;
+		String filePath = null;
+		//ALL arguments need to be checked
+		
+		for(int i = 0; i < args.length; i++) {
+			if((args[i].equals("-e") || args[i].equals("--execute")) && scriptToExecute == null) {
+				if(i + 1 < args.length) {
+					if(!isArgument(args[i+1])) {
+						scriptToExecute = args[i+1];
+						i++; //Skip the next iteration
+						continue;
+					}
+				}
+				throw new IllegalArgumentException("Expecting string after " + args[i] + " [script_to_execute]");
+			} else if((args[i].equals("-f") || args[i].equals("--file")) && filePath == null) {
+				if(i + 1 < args.length) {
+					if(!isArgument(args[i+1])) {
+						filePath = args[i+1];
+						i++;
+						continue;
+					} 
+				}
+				throw new IllegalArgumentException("Expecting string after " + args[i] + " [path_to_file]");
+			} else if(args[i].equals("--nogui")) {
+				initGUI = false;
+				continue;
 			}
-			reader.close();
-			p.execute(code, false);
-			return;
+			System.out.println("Valid arguments are:\n-f | --file\tOpens the file in the editor (If --nogui is set, the file is executed)\n-e | --execute\tOpens the script with the editor (If --nogui is set, the script is executed)\n   | --nogui\tOpens the command line editor");
+			throw new IllegalArgumentException("Unknown argument " + args[i] );
 		}
 
-		if(args[0].equals("-e") || args[0].equals("--execute")) {
-			if(args.length < 2) {
-				System.err.println("Argument " + args[0] + " expects an executable script, e.g.: -e \"println \"Hello World;\"\"");
-				System.exit(-1);
+		if(initGUI) {
+			Window w = new Window();
+			if(filePath != null) {
+				w.openDocument(new File(filePath));
+			} else if(scriptToExecute != null) {
+				w.setScript(scriptToExecute);
 			}
-			p.execute(args[1], true);
-		} else if(args[0].equals("-f") || args[0].equals("--file")) {
-			if(args.length < 2) {
-				System.err.println("Argument " + args[0] + " expects a path to a text file containing the script");
-				System.exit(-1);
+		} else {
+			Process p = new Process(true);
+			p.addSystemOutput();
+			p.setInput(System.in);
+			
+			if(filePath != null) {
+				p.execute(new File(args[1]), true);
+			} else if(scriptToExecute != null) {
+				p.execute(args[1], true);
+			} else {
+				if(ConsoleMain.class.getResourceAsStream("/Editor.txt") == null) {
+					System.err.println("Editor file is missing at: " + URLDecoder.decode(ConsoleMain.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"));
+					return;
+				}
+				BufferedReader reader = new BufferedReader(new InputStreamReader(ConsoleMain.class.getResourceAsStream("/Editor.txt")));
+				String code  = "";
+				String line = reader.readLine();
+				while(line != null) {
+					code += line;
+					line = reader.readLine();
+				}
+				reader.close();
+				p.execute(code, false);
+				return;
 			}
-			p.execute(new File(args[1]), true);
-		}  else if(args[0].equals("--gui") || args[0].equals("-g")) {
-			new Window();
 		}
 	}
+	
+	private static boolean isArgument(String arg) {
+		return arg.equals("-f") || arg.equals("--file") || arg.equals("-e") || arg.equals("--execute") || arg.equals("--nogui");
+	}
 }

com/devkev/devscript/raw/Process.java

@@ -33,7 +33,7 @@ public class Process {
 
 	public long maxRuntime = 0; //Runtime in ms. If < 0, runtime is infinite
 	private long start = 0;
-	public final String version = "1.8.3"; 
+	public final String version = "1.9.0"; 
 
 	/**The file, the script is executed from. May be null. Just useful for some Native commands*/
 	public File file = null;
@@ -106,6 +106,7 @@ public Thread execute(String script, boolean newThread) {
 
 		script = script.replaceAll("\t", "");
 		script = script.replaceAll("\r", "");
+		script = script.replaceAll("\n", " ");
 
 		main = new Block(new StringBuilder(script), null);
 		main.thread = null;