X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FRes.java;h=b529a4e4402a29f1e6c12d50d08d2d94db55cb50;hb=e1da86ef35e219b79c3de0c099cf82b2500dc448;hp=b2ae73b84fac15edda437122f66fdc31516b4943;hpb=67eeff476179a91ae930ea89cbecde22132ca532;p=org.ibex.core.git diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java index b2ae73b..b529a4e 100644 --- a/src/org/xwt/Res.java +++ b/src/org/xwt/Res.java @@ -1,3 +1,4 @@ +// FIXEME // Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; @@ -12,19 +13,15 @@ import org.bouncycastle.util.encoders.Base64; /** Base class for XWT resources */ public abstract class Res extends JS { - - // Public Static ////////////////////////////////////////////////////////////////////// - - // FIXME: move to XWT.load()? - public static Res fromString(String url) { - if (url.startsWith("http://")) return new HTTP(url); - else if (url.startsWith("https://")) return new HTTP(url); - else if (url.startsWith("data:")) return new ByteArray(Base64.decode(url.substring(5))); - else if (url.startsWith("utf8:")) return new ByteArray(url.substring(5).getBytes()); - throw new JS.Exn("invalid resource specifier " + url); + /** return a resource for a given url */ + public static final Res fromURL(String url) throws JSExn { + if (url.startsWith("http://")) return new Res.HTTP(url); + else if (url.startsWith("https://")) return new Res.HTTP(url); + else if (url.startsWith("data:")) return new Res.ByteArray(Base64.decode(url.substring(5)), null); + else if (url.startsWith("utf8:")) return new Res.ByteArray(url.substring(5).getBytes(), null); + throw new JSExn("invalid resource specifier " + url); } - // Base Class ////////////////////////////////////////////////////////////////////// public String typeName() { return "resource"; } @@ -32,7 +29,6 @@ public abstract class Res extends JS { /** so that we get the same subresource each time */ private Hash refCache = null; - /** FIXME: needed? good idea? */ public Template t = null; public final InputStream getInputStream() throws IOException { return getInputStream(""); } @@ -40,10 +36,15 @@ public abstract class Res extends JS { public Res addExtension(String extension) { return new Ref(this, extension); } - public Object get(Object key) { + public Object get(Object key) throws JSExn { if ("".equals(key)) { - Template t = Template.getTemplate(addExtension(".xwt")); - return t == null ? null : t.getStatic(); + try { + Template t = Template.getTemplate(addExtension(".xwt")); + return t == null ? null : t.getStatic(null); /** FIXME VERY BAD! */ + } catch (Exception e) { + Log.info(this, e); + return null; + } } Object ret = refCache == null ? null : refCache.get(key); if (ret != null) return ret; @@ -57,35 +58,33 @@ public abstract class Res extends JS { // Caching ////////////////////////////////////////////////////////////////////// - private static class NotCacheableException extends Exception { } - private static NotCacheableException notCacheable = new NotCacheableException(); + public static class NotCacheableException extends Exception { } + public static NotCacheableException notCacheable = new NotCacheableException(); /** if it makes sense to cache a resource, the resource must return a unique key */ public String getCacheKey() throws NotCacheableException { throw notCacheable; } - // FIXME: general cleanup /** subclass from this if you want a CachedInputStream for each path */ public static class CachedRes extends Res { private Res parent; private boolean disk = false; - public String getCacheKey() throws NotCacheableException { return parent.getCacheKey(); } + private String key; + public String getCacheKey() throws NotCacheableException { return key; } + public String toString() { return key; } private Hash cachedInputStreams = new Hash(); - public CachedRes(Res p, String s, boolean d) { this.parent = p; this.disk = d; } + public CachedRes(Res p, String s, boolean d) throws NotCacheableException { + this.parent = p; this.disk = d; this.key = p.getCacheKey(); + } public InputStream getInputStream(String path) throws IOException { CachedInputStream cis = (CachedInputStream)cachedInputStreams.get(path); if (cis == null) { - java.io.File f = null; if (disk) { - f = new java.io.File(System.getProperty("user.home") + - java.io.File.separatorChar + ".xwt" + - java.io.File.separatorChar + "caches" + - java.io.File.separatorChar + - new String(Base64.encode(parent.getCacheKey().getBytes()))); - Log.log(this, "caching resource in " + f); - new java.io.File(f.getParent()).mkdirs(); + java.io.File f = LocalStorage.Cache.getCacheFileForKey(key); if (f.exists()) return new FileInputStream(f); + cis = new CachedInputStream(parent.getInputStream(path), f); + } else { + cis = new CachedInputStream(parent.getInputStream(path)); } - cis = new CachedInputStream(parent.getInputStream(path), f); cachedInputStreams.put(path, cis); } return cis.getInputStream(); @@ -98,7 +97,8 @@ public abstract class Res extends JS { /** HTTP or HTTPS resource */ public static class HTTP extends Res { private String url; - HTTP(String url) { while (url.endsWith('/')) url = url.substring(0, url.length() - 1); this.url = url; } + HTTP(String url) { while (url.endsWith("/")) url = url.substring(0, url.length() - 1); this.url = url; } + public String toString() { return url; } public String getCacheKey() throws NotCacheableException { return url; } public InputStream getInputStream(String path) throws IOException { return new org.xwt.HTTP(url + path).GET(); } } @@ -107,10 +107,11 @@ public abstract class Res extends JS { public static class ByteArray extends Res { private byte[] bytes; private String cacheKey = null; - ByteArray(byte[] bytes, String cacheKey) { this.bytes = bytes; this.cacheKey = cacheKey; }} + ByteArray(byte[] bytes, String cacheKey) { this.bytes = bytes; this.cacheKey = cacheKey; } + public String toString() { return "byte[]"; } public String getCacheKey() throws NotCacheableException { return cacheKey; } public InputStream getInputStream(String path) throws IOException { - if (!"".equals(path)) throw new JS.Exn("can't get subresources of a byte[] resource"); + if (!"".equals(path)) throw new IOException("can't get subresources of a byte[] resource"); return new ByteArrayInputStream(bytes); } } @@ -119,9 +120,10 @@ public abstract class Res extends JS { public static class File extends Res { private String path; File(String path) { - while (path.endsWith(java.io.File.separatorChar)) path = path.substring(0, path.length() - 1); + while (path.endsWith(java.io.File.separatorChar + "")) path = path.substring(0, path.length() - 1); this.path = path; } + public String toString() { return "file:" + path; } public String getCacheKey() throws NotCacheableException { throw notCacheable; } // already on the disk! public InputStream getInputStream(String rest) throws IOException { return new FileInputStream((path + rest).replace('/', java.io.File.separatorChar)); } @@ -131,6 +133,7 @@ public abstract class Res extends JS { public static class Zip extends Res { private Res parent; Zip(Res parent) { this.parent = parent; } + public String toString() { return parent.toString() + "!zip"; } public String getCacheKey() throws NotCacheableException { return parent.getCacheKey() + "!zip:"; } public InputStream getInputStream(String path) throws IOException { if (path.startsWith("/")) path = path.substring(1); @@ -138,7 +141,7 @@ public abstract class Res extends JS { 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 (" + path + ") not found in archive"); + if (ze == null) throw new IOException("requested file (" + path + ") not found in archive"); return new KnownLength.KnownLengthInputStream(zis, (int)ze.getSize()); } } @@ -147,6 +150,7 @@ public abstract class Res extends JS { public static class Cab extends Res { private Res parent; Cab(Res parent) { this.parent = parent; } + public String toString() { return parent.toString() + "!cab"; } public String getCacheKey() throws NotCacheableException { return parent.getCacheKey() + "!cab:"; } public InputStream getInputStream(String path) throws IOException { if (path.startsWith("/")) path = path.substring(1); @@ -156,18 +160,20 @@ public abstract class Res extends JS { /** the Builtin resource */ public static class Builtin extends Res { - public Builtin() { }; - public String getCacheKey() throws NotCacheableException { throw notCacheable; } // not cacheable - public InputStream getInputStream(String path) throws IOException { - if (!path.equals("")) throw new IOException("the builtin resource has no subresources"); - return Platform.getBuiltinInputStream(); - } + public Builtin() { }; + public String getCacheKey() throws NotCacheableException { throw notCacheable; } // not cacheable + public String toString() { 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; Object key; + public String toString() { return parent.toString() + "/" + key; } Ref(Res parent, Object key) { this.parent = parent; this.key = key; } public String getCacheKey() throws NotCacheableException { return parent.getCacheKey() + "/" + key; } public Res addExtension(String extension) { @@ -175,11 +181,35 @@ public abstract class Res extends JS { public InputStream getInputStream(String path) throws IOException { return parent.getInputStream("/" + key + path); } } + /** provides redirection of a specified key */ + public static class Graft extends Res { + Res graftee; + Object replaced_key, replaced_val; + Graft(Res graftee, Object key, Object val) { this.graftee = graftee; this.replaced_key = key; this.replaced_val = val; } + public boolean equals(Object o) { return this == o || graftee.equals(o); } + public int hashCode() { return graftee.hashCode(); } + public InputStream getInputStream(String s) throws IOException { return graftee.getInputStream(s); } + public Object get(Object key) throws JSExn { return replaced_key.equals(key) ? replaced_val : graftee.get(key); } + public Object callMethod(Object name, Object a, Object b, Object c, Object[] rest, int nargs) throws JSExn { + if (replaced_key.equals(name)) { + if (replaced_val instanceof JS) return ((JS)replaced_val).call(a, b, c, rest, nargs); + else throw new JSExn("attempted to call non-function (class="+replaced_val.getClass()+")"); + } else { + return graftee.callMethod(name, a, b, c, rest, nargs); + } + } + 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; JSFunction callback; ProgressWatcher(Res watchee, JSFunction callback) { this.watchee = watchee; this.callback = callback; } + public String toString() { return watchee.toString(); } public String getCacheKey() throws NotCacheableException { return watchee.getCacheKey(); } public InputStream getInputStream(String s) throws IOException { final InputStream is = watchee.getInputStream(s); @@ -193,11 +223,9 @@ public abstract class Res extends JS { 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 void perform() { - JSArray args = new JSArray(); - args.addElement(new Integer(bytesDownloaded)); - args.addElement(new Integer(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0)); - callback.call(args); + Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { + callback.call(N(bytesDownloaded), + N(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0), null, null, 2); } }); return ret; }