X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FRes.java;h=196bb2c04146f01f7c6c14d67019b1db72f22f45;hb=6a96430e10e27fc1de5754cb5add705f929dd109;hp=1f1a9279e90f20b458962cfedaeeb8595de95d31;hpb=1019725cfa88d9ad5dfabaf178e87da79c9c3e17;p=org.ibex.core.git diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java index 1f1a927..196bb2c 100644 --- a/src/org/xwt/Res.java +++ b/src/org/xwt/Res.java @@ -12,6 +12,7 @@ import org.bouncycastle.util.encoders.Base64; public abstract class Res extends JS { public String getDescriptiveName() { return ""; } + public String typeName() { return "resource"; } /** cache of subresources so that the equality operator works on them */ private Hash refCache = null; @@ -20,8 +21,33 @@ public abstract class Res extends JS { public Res getParent() { return null; } + /** an InputStream that makes sure it is not in the MessageQueue when blocked on a read */ + // FIXME + private static class BackgroundInputStream extends FilterInputStream { + BackgroundInputStream(InputStream i) { super(i); } + /* + private void suspend() throws IOException { + if (!ThreadMessage.suspendThread()) + throw new IOException("attempt to perform background-only operation in a foreground thread"); + } + private void resume() { + ThreadMessage.resumeThread(); + } + public int read() throws IOException { + suspend(); + try { return super.read(); } + finally { resume(); } + } + public int read(byte[] b, int off, int len) throws IOException { + suspend(); + try { return super.read(b, off, len); } + finally { resume(); } + } + */ + } + /** returns an InputStream containing the Resource's contents */ - public InputStream getInputStream() throws IOException { return getInputStream(""); } + public final InputStream getInputStream() throws IOException { return new BackgroundInputStream(getInputStream("")); } public abstract InputStream getInputStream(String path) throws IOException; /** graft newResource in place of this resource on its parent */ @@ -45,29 +71,49 @@ public abstract class Res extends JS { return ret; } - public static Res stringToRes(String url) { return stringToRes(url, false); } - public static Res stringToRes(String url, boolean permitLocalFilesystem) { - if (url.indexOf('!') != -1) - return (Res)(new Zip(stringToRes(url.substring(0, url.lastIndexOf('!')))).get(url.substring(url.lastIndexOf('!') + 1))); + public static Res stringToRes(String url) { + if (url.indexOf('!') != -1) { + Res ret = new Zip(stringToRes(url.substring(0, url.lastIndexOf('!')))); + String subpath = url.substring(url.lastIndexOf('!') + 1); + if (subpath.length() > 0) ret = (Res)ret.get(subpath); + return ret; + } if (url.startsWith("http://")) return new HTTP(url); if (url.startsWith("https://")) return new HTTP(url); - if (url.startsWith("file:") && permitLocalFilesystem) return new File(url.substring(5)); if (url.startsWith("cab:")) return new CAB(stringToRes(url.substring(4))); if (url.startsWith("data:")) return new ByteArray(Base64.decode(url.substring(5))); + if (url.startsWith("utf8:")) return new ByteArray(url.substring(5).getBytes()); throw new JS.Exn("invalid resource specifier " + url); } + /** subclass from this if you want a CachedInputStream for each path */ + public static abstract class CachedRes extends Res { + private Hash cachedInputStreams = new Hash(); + abstract InputStream _getInputStream(String path) throws IOException; + public final InputStream getInputStream(String path) throws IOException { + CachedInputStream cis = (CachedInputStream)cachedInputStreams.get(path); + if (cis == null) { + cis = new CachedInputStream(_getInputStream(path)); + cachedInputStreams.put(path, cis); + } + return cis.getInputStream(); + } + } + /** HTTP or HTTPS resource */ - public static class HTTP extends Res { + public static class HTTP extends CachedRes { private String url; HTTP(String url) { this.url = url; } - public InputStream getInputStream(String path) throws IOException { return new org.xwt.HTTP(url + path).GET(); } + public String getDescriptiveName() { return url; } + public InputStream _getInputStream(String path) throws IOException { + return new org.xwt.HTTP(url + path).GET(); } } /** byte arrays */ public static class ByteArray extends Res { private byte[] bytes; ByteArray(byte[] bytes) { this.bytes = bytes; } + public String getDescriptiveName() { return "byte[]"; } public InputStream getInputStream(String path) throws IOException { if (!"".equals(path)) throw new JS.Exn("can't get subresources of a byte[] resource"); return new ByteArrayInputStream(bytes); @@ -78,34 +124,37 @@ public abstract class Res extends JS { public static class File extends Res { private String path; File(String path) { this.path = path; } + public String getDescriptiveName() { return "file://" + path; } public InputStream getInputStream(String rest) throws IOException { return new FileInputStream((path + rest).replace('/', java.io.File.separatorChar)); } } - /** wrap a Res around a preexisting InputStream */ - public static class IS extends Res { - InputStream parent; - IS(InputStream parent) { this.parent = parent; } - public InputStream getInputStream(String path) { - if (!"".equals(path)) throw new JS.Exn("can't access subresources of IS"); - return parent; - } - } - /** "unwrap" a Zip archive */ public static class Zip extends Res { private Res parent; Zip(Res parent) { this.parent = parent; } + public String getDescriptiveName() { return parent.getDescriptiveName() + "!"; } public InputStream getInputStream(String path) throws IOException { if (path.startsWith("/")) path = path.substring(1); - ZipInputStream zis = new ZipInputStream(parent.getInputStream()); + InputStream pis = parent.getInputStream(); + ZipInputStream zis = new ZipInputStream(pis); ZipEntry ze = zis.getNextEntry(); while(ze != null && !ze.getName().equals(path)) ze = zis.getNextEntry(); - if (ze == null) throw new JS.Exn("requested file not found in archive"); - return zis; + if (ze == null) throw new JS.Exn("requested file (" + path + ") not found in archive"); + return new KnownLength.KnownLengthInputStream(zis, (int)ze.getSize()); } } + /** the Builtin resource */ + public static class Builtin extends Res { + public Builtin() { }; + public String getDescriptiveName() { return "[builtin]"; } + public InputStream getInputStream(String path) throws IOException { + if (!path.equals("")) throw new IOException("the builtin resource has no subresources"); + return Platform.getBuiltinInputStream(); + } + } + /** what you get when you reference a subresource */ public static class Ref extends Res { Res parent; @@ -113,7 +162,9 @@ public abstract class Res extends JS { Ref(Res parent, Object key) { this.parent = parent; this.key = key; } public String getDescriptiveName() { String pdn = parent.getDescriptiveName(); - return pdn.equals("") ? key.toString() : (pdn + "." + key.toString()); + if (pdn.equals("")) return key.toString(); + if (!pdn.endsWith("!")) pdn += "."; + return pdn + key.toString(); } public Res addExtension(String extension) { return (key instanceof String && ((String)key).endsWith(extension)) ? this : new Ref(parent, key + extension); @@ -125,6 +176,7 @@ public abstract class Res extends JS { public Res graft(Object newResource) { return new Graft(parent, key, newResource); } } + // FEATURE: eliminate code duplication with JS.Graft /** shadow resource which replaces the graft */ public static class Graft extends Res { Res graftee; @@ -137,6 +189,48 @@ public abstract class Res extends JS { public Object get(Object key) { return replaced_key.equals(key) ? replaced_val : graftee.get(key); } public String getDescriptiveName() { return graftee.getDescriptiveName(); } public Res getParent() { return graftee.getParent(); } + public Object callMethod(Object method, Array args, boolean checkOnly) throws JS.Exn { + if (!replaced_key.equals(method)) return graftee.callMethod(method, args, checkOnly); + if (replaced_val instanceof Callable) return checkOnly ? Boolean.TRUE : ((Callable)replaced_val).call(args); + if (checkOnly) return Boolean.FALSE; + throw new JS.Exn("attempt to call non-function"); + } + public Number coerceToNumber() { return graftee.coerceToNumber(); } + public String coerceToString() { return graftee.coerceToString(); } + public boolean coerceToBoolean() { return graftee.coerceToBoolean(); } + public String typeName() { return graftee.typeName(); } + } + + /** shadow resource which replaces the graft */ + public static class ProgressWatcher extends Res { + final Res watchee; + JS.CompiledFunction callback; + ProgressWatcher(Res watchee, JS.CompiledFunction callback) { this.watchee = watchee; this.callback = callback; } + public String getDescriptiveName() { return watchee.getDescriptiveName(); } + public InputStream getInputStream(String s) throws IOException { + final InputStream is = watchee.getInputStream(s); + return new FilterInputStream(is) { + int bytesDownloaded = 0; + public int read() throws IOException { + int ret = super.read(); + if (ret != -1) bytesDownloaded++; + return ret; + } + public int read(byte[] b, int off, int len) throws IOException { + int ret = super.read(b, off, len); + if (ret != 1) bytesDownloaded += ret; + Scheduler.add(new Scheduler.Task() { public Object call(Object arg) { + JS.Array args = new JS.Array(); + args.addElement(new Integer(bytesDownloaded)); + args.addElement(new Integer(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0)); + // FIXME + // new JS.Thread(callback, callbackScope).resume(); + return null; + } }); + return ret; + } + }; + } } /** unpacks a Microsoft CAB file (possibly embedded in another file; we scan for 'MSCF' */ @@ -147,22 +241,13 @@ public abstract class Res extends JS { return ((i & 0xff) << 24) | ((i & 0xff00) << 8) | ((i & 0xff0000) >>> 8) | (i >>> 24); } public InputStream getInputStream(String path) throws IOException { - InputStream is = parent.getInputStream(); - byte[] scan = new byte[4]; - int ofs = 0; - for(int i=0; i<2; i++) { - // wierdly, .exe files have three MSCF's - while(scan[0] != 'M' || scan[1] != 'S' || scan[2] != 'C' || scan[3] != 'F') { - System.arraycopy(scan, 1, scan, 0, 3); - int read = is.read(); - if (read == -1) throw new JS.Exn("MSCF header tag not found in file"); - scan[3] = (byte)read; - ofs++; - } - scan[0] = 0; + try { + return org.xwt.util.CAB.getFileInputStream(parent.getInputStream(), 2, path); + } catch (EOFException eof) { + throw new JS.Exn("MSCF header tag not found in file"); + } catch (IOException ioe) { + throw new JS.Exn("IOException while reading file"); } - Log.log(this, "found MSCF header at offset " + ofs); - return org.xwt.util.CAB.getFileInputStream(is, path, true); } }