compiler factory and advanced url handler

Author: Ecdcaeb

src/main/java/mods/Hileb/shotaasm/impl/ShotaCompiler.java

@@ -30,6 +30,8 @@ public String name() {
 
     @Override
     public Runnable compile(final ScriptFile file) {
+        CompilerFactory CompilerFactory = new CompilerFactory(Launch.classLoader.getURLs());
+
         if (file.property().containsKey("event")) {
             String event = Iterables.getFirst(file.property().get("event"), null);
             if (event != null) {
@@ -57,7 +59,7 @@ public Runnable compile(final ScriptFile file) {
                     .append(file.text())
                     .append("    }\n}");
             try {
-                Compiler compiler = new Compiler(Launch.classLoader.getURLs());
+                Compiler compiler = CompilerFactory.compiler();
                 compiler.addSource(name, builder.toString());
                 CompileError error = compiler.compile();
                 if (error != null) throw new RuntimeException(error);

src/main/java/mods/Hileb/shotaasm/impl/compiler/Compiler.java

@@ -14,7 +14,7 @@
 
 public class Compiler {
 
-    private final URL[] extraClasspath;
+    public List<String> options = null;
 
     private final Map<String, VirtualJavaFileObject> javaFileObjectMap = new HashMap<>();
     private Map<String, byte[]> results = new HashMap<>();
@@ -25,8 +25,8 @@ public Compiler(){
         this(null);
     }
 
-    public Compiler(URL[] extraClasspath) {
-        this.extraClasspath = extraClasspath;
+    public Compiler(List<String> options) {
+        this.options = options;
     }
 
     public void addSource(String name, String content) {
@@ -63,21 +63,6 @@ public CompileError compile() {
         else {
             try(StandardJavaFileManager standardJavaFileManager = compiler.getStandardFileManager(null, null, StandardCharsets.UTF_8)) {
                 VirtualFileManager fileManager = new VirtualFileManager(standardJavaFileManager, this.javaFileObjectMap);
-                List<String> options = null;
-                if (extraClasspath != null) {
-                    List<String> pathList = new LinkedList<>();
-                    for (URL url : extraClasspath) { 
-                        try {
-                            pathList.add(url.toString());
-                        } catch (URISyntaxException ignored) {} // Ignore the lib.
-                    }
-                    String systemClasspath = System.getProperty("java.class.path");
-                    String combinedClasspath = String.join(File.pathSeparator, pathList) + File.pathSeparator + systemClasspath;
-                    options = new ArrayList<>();
-                    options.add("-classpath");
-                    options.add(combinedClasspath);
-                    options.add("-Xlint:unchecked");
-                }
                 try {
                     StringWriter stringWriter = new StringWriter();
                     JavaCompiler.CompilationTask task = compiler.getTask(stringWriter, fileManager, (DiagnosticListener<? super JavaFileObject>)(Object) listener, options, null, javaFileObjectMap.values());
@@ -94,6 +79,8 @@ public CompileError compile() {
         }
     }
 
+
+
     public void setListener(DiagnosticListener<VirtualJavaFileObject> listener) {
         this.listener = listener;
     }

src/main/java/mods/Hileb/shotaasm/impl/compiler/CompilerFactory.java

@@ -0,0 +1,48 @@
+package mods.Hileb.shotaasm.impl.compiler;
+
+import com.google.common.collect.Iterables;
+import mods.Hileb.shotaasm.impl.compiler.virtual.VirtualFileManager;
+import mods.Hileb.shotaasm.impl.compiler.virtual.VirtualJavaFileObject;
+
+import javax.tools.*;
+import java.io.*;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.util.*;
+
+public class CompilerFactory{
+    public List<String> options = null;
+
+    public CompilerFactory(URL[] classpath) {
+        this.options = new ArrayList<>();
+        this.options.add("-classpath");
+        this.options.add(buildClasspath(classpath));
+        this.options.add("-Xlint:unchecked");
+    }
+
+    public Compiler compiler(){
+        return new Compiler(this.options);
+    }
+
+    public static String buildClasspath(URL[] urls) {
+        if (urls == null || urls.length == 0) return System.getProperty("java.class.path");
+
+        StringBuilder classpath = new StringBuilder(System.getProperty("java.class.path"));
+        for (URL url : urls) {
+            try {
+                //Attempt to handle different URL schemes.  This is not exhaustive, but covers common cases.
+                if("file".equals(url.getProtocol())){
+                    //Handle potential space in file path
+                    classpath.append(File.pathSeparator).append(url.getPath().replace(" ", "%20"));
+                } else {
+                    classpath.append(File.pathSeparator).append(url.toString());
+                }
+            } catch (Exception e) {
+                ShotaASM.LOGGER.error("Error processing URL {} because of {}", url, e);
+            }
+        }
+        return classpath.toString();
+    }
+}