Netsyms
/
SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add toolkit jar loading at runtime

Browse Source
master
skylarmt 9 years ago
parent 90cbc4104f
commit 11115feebf
3 changed files with 153 additions and 15 deletions
Show Stats Download Patch File Download Diff File

128
src/net/apocalypselabs/symat/CodeRunner.java
Unescape Escape View File

@ -46,9 +46,15 @@
package net.apocalypselabs.symat;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
@ -63,6 +69,8 @@ public class CodeRunner {
private ScriptEngine se;
private StringWriter sw = new StringWriter();
private PrintWriter pw = new PrintWriter(sw);
private String modules = "";
private String moduleterm = "";
// If we need to wrap code around input to make everything nice.
private boolean wrapRequired = false;
@ -76,13 +84,14 @@ public class CodeRunner {
public CodeRunner(int lang) {
this(lang == 0 ? "js" : "py");
}
public CodeRunner(String lang) {
scriptLang = lang;
switch (lang) {
case "javascript":
case "js":
case "rhino":
scriptLang = "javascript";
se = new ScriptEngineManager().getEngineByName("rhino");
wrapRequired = true;
try {
@ -90,7 +99,8 @@ public class CodeRunner {
se.eval("importClass(net.apocalypselabs.symat.Functions);"
+ "SyMAT_Functions = new net.apocalypselabs.symat.Functions();"
+ "SyMAT_Functions.setLang('js');\n"
+ getFunctions("js"));
+ getFunctions("js")
+ loadToolkits());
// Allow engine access from scripts.
se.put("engine", se);
attachWriters();
@ -101,13 +111,15 @@ public class CodeRunner {
case "python":
case "jython":
case "py":
scriptLang = "python";
se = new ScriptEngineManager().getEngineByName("python");
try {
se.eval("from math import *\n"
+ "from net.apocalypselabs.symat import Functions\n"
+ "_=Functions()\n"
+ "_.setLang('py')\n\n"
+ getFunctions("py"));
+ getFunctions("py")
+ loadToolkits());
// Allow engine access from scripts.
se.put("engine", se);
attachWriters();
@ -120,17 +132,113 @@ public class CodeRunner {
}
}
public static List<InputStream> loadResources(final String name,
final ClassLoader classLoader) throws IOException {
final List<InputStream> list = new ArrayList<InputStream>();
final Enumeration<URL> systemResources
= (classLoader == null ? ClassLoader.getSystemClassLoader() : classLoader)
.getResources(name);
while (systemResources.hasMoreElements()) {
list.add(systemResources.nextElement().openStream());
}
return list;
}
private String loadToolkits() {
String out = "";
try {
List<InputStream> il = loadResources("meta.txt", null);
InputStream[] ii = new InputStream[il.size()];
for (InputStream i : il.toArray(ii)) {
BufferedReader br = new BufferedReader(new InputStreamReader(i));
while (br.ready()) {
String l = br.readLine();
if (l.contains("=")) {
String classname = l.split("=")[0];
String varname = l.split("=")[1];
if (scriptLang.equals("javascript")) {
out += "importClass(" + classname + ");"
+ varname + " = new " + classname + "();";
modules += "with(" + varname + "){";
moduleterm += "}";
} else {
out += "from "
+ classname.substring(0, classname.lastIndexOf("."))
+ " import " + classname.substring(classname.lastIndexOf(".") + 1) + "\n"
+ varname + " = " + classname.substring(classname.lastIndexOf(".") + 1) + "()\n";
}
}
}
}
} catch (Exception ex) {
}
Debug.println(out);
return out;
}
@Deprecated
public CodeRunner(String lang, boolean shell) {
this(lang);
}
public void attachWriters() {
private void attachWriters() {
se.getContext().setWriter(pw);
se.getContext().setErrorWriter(pw);
Debug.println("Attached writers.");
}
// private String loadModules() {
// String out = "";
// try {
// String fsep = System.getProperty("file.separator");
// File file = new File(System.getProperty("user.home") + fsep + ".symat" + fsep + "modules" + fsep);
// file.mkdirs();
// File f = new File(System.getProperty("user.home") + fsep + ".symat" + fsep);
// try {
// URL url = f.toURI().toURL();
// URL[] urls = new URL[]{url};
//
// String cname = f.getName().replace(".class", "");
// ClassLoader cl = new URLClassLoader(urls);
// Class cls = cl.loadClass("modules." + cname);
// if (scriptLang.equals("python")) {
// char[] argletters
// = {'a', 'b', 'c', 'd', 'e', 'f',
// 'g', 'h', 'i', 'j', 'k', 'l',
// 'm', 'n', 'o', 'p', 'q', 'r',
// 's', 't', 'u', 'v', 'w', 'x',
// 'y', 'z'};
// out = "from modules import " + cname + "\n";
// Method[] meth = cls.getMethods();
//
// for (Method m : meth) {
// out += "def " + m.getName() + "(";
// String args = "";
// for (int i = 0; i < m.getParameterCount(); i++) {
// args += argletters[i] + ",";
// }
// if (args.endsWith(",")) {
// args = args.substring(0, args.length() - 1);
// }
// out += args + "):\n\treturn " + cname + "()." + m.getName() + "(" + args + ")\n";
// }
// } else {
// out = "importClass(modules." + cname + ");"
// + "SyMAT_" + cname
// + " = new modules." + cname + "();";
// modules += "with(SyMAT_" + cname + "){";
// moduleterm += "}";
// }
// } catch (Exception e) {
// Debug.stacktrace(e);
// }
// } catch (Exception e) {
// Debug.stacktrace(e);
// return "";
// }
// return out;
// }
/**
* Inits the Python engine on application start.
*
@ -141,15 +249,15 @@ public class CodeRunner {
se = new ScriptEngineManager().getEngineByName("python");
}
}
public StringWriter getStringWriter() {
return sw;
}
public PrintWriter getPrintWriter() {
return pw;
}
public String getBufferDump() {
String dump = sw.toString();
sw.getBuffer().setLength(0);
@ -181,7 +289,7 @@ public class CodeRunner {
return formatEx(ex);
}
}
/**
* Parse code and use the default output writers.
*
@ -215,7 +323,7 @@ public class CodeRunner {
*/
private String wrapMath(String eval) {
if (wrapRequired) {
String with = "with(SyMAT_Functions){with(Math){" + eval + "}}";
String with = "with(SyMAT_Functions){" + modules + "with(Math){" + eval + "}}" + moduleterm;
return with;
}
return eval;

4
src/net/apocalypselabs/symat/Main.java
Unescape Escape View File

@ -102,7 +102,7 @@ public class Main extends JRibbonFrame {
/**
* Version name, as it should be displayed.
*/
public static final String VERSION_NAME = "1.7";
public static final String VERSION_NAME = "1.8";
/**
* The word "SyMAT".
@ -115,7 +115,7 @@ public class Main extends JRibbonFrame {
/**
* Version number, for updates and //needs in scripts
*/
public static final double APP_CODE = 20;
public static final double APP_CODE = 21;
/**
* Base URL for building API calls
*/

36
src/net/apocalypselabs/symat/SplashScreen.java
Unescape Escape View File

@ -47,9 +47,13 @@ package net.apocalypselabs.symat;
import java.awt.Color;
import java.io.BufferedReader;
import java.io.File;
import java.io.FilenameFilter;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import javax.swing.SwingUtilities;
import static net.apocalypselabs.symat.Main.API_URL;
import static net.apocalypselabs.symat.Main.APP_CODE;
@ -174,19 +178,44 @@ public class SplashScreen extends javax.swing.JFrame {
// Get editor going too
Editor edit = new Editor();
}
setProgress("Loading toolkits...");
try {
String fsep = System.getProperty("file.separator");
File dir = new File(System.getProperty("user.home") + fsep + ".symat" + fsep + "toolkits");
dir.mkdirs();
File[] files = dir.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.endsWith(".jar");
}
});
for (File f : files) {
addSoftwareLibrary(f);
}
} catch (Exception ex) {
Debug.stacktrace(ex);
}
if (!PrefStorage.getSetting("skipupdates").equals("yes")) {
setProgress("Checking for updates...");
checkUpdates();
}
setProgress("Loading main interface...");
Main main = new Main();
setProgress("Done!");
dispose();
}
// Thanks to http://stackoverflow.com/a/9460999/2534036
private void addSoftwareLibrary(File file) throws Exception {
Method method = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class});
method.setAccessible(true);
method.invoke(ClassLoader.getSystemClassLoader(), new Object[]{file.toURI().toURL()});
Debug.println("Loaded toolkit " + file.getName());
}
private void checkUpdates() {
// Check for updates.
try {
@ -221,6 +250,7 @@ public class SplashScreen extends javax.swing.JFrame {
/**
* Set the progress text.
*
* @param label The String to put on the label.
*/
private void setProgress(String label) {

Write Preview
Loading…
Cancel
Save