X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FStream.java;h=2344e76745b6c08e8873f570e034ff38e787ded0;hb=ce791e4058158295bce9cf7b6698c2b565d571d7;hp=878afa33dc04b595482fa87b41e66cf8affa6f39;hpb=4daeeb4119b901d53b44913c86f8af3ce67db925;p=org.ibex.core.git diff --git a/src/org/ibex/js/Stream.java b/src/org/ibex/js/Stream.java index 878afa3..2344e76 100644 --- a/src/org/ibex/js/Stream.java +++ b/src/org/ibex/js/Stream.java @@ -1,11 +1,11 @@ // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] -package org.ibex; +package org.ibex.js; import java.io.*; import java.util.zip.*; -import org.ibex.js.*; import org.ibex.util.*; -import org.ibex.translators.MSPack; +import org.ibex.plat.*; +import org.ibex.net.*; /** * Essentiall an InputStream "factory". You can repeatedly ask a @@ -13,43 +13,42 @@ import org.ibex.translators.MSPack; * be totally independent of the others (ie separate stream position * and state) although they draw from the same data source. */ -public abstract class Stream extends JS.Cloneable { +public abstract class Stream extends JS implements JS.Cloneable { // Public Interface ////////////////////////////////////////////////////////////////////////////// - public static InputStream getInputStream(Object js) throws IOException { return ((Stream)((JS)js).unclone()).getInputStream();} + public static InputStream getInputStream(JS js) throws IOException { return ((Stream)js.unclone()).getInputStream();} public static class NotCacheableException extends Exception { } - // streams are "sealed" by default to prevent accidental object leakage - public void put(Object key, Object val) { } private Cache getCache = new Cache(100); - protected Object _get(Object key) { return null; } - public final Object get(Object key) { - Object ret = getCache.get(key); + protected JS _get(Object key) { return null; } + public final JS get(JS key) { + JS ret = (JS) getCache.get(key); if (ret == null) getCache.put(key, ret = _get(key)); return ret; } // Private Interface ////////////////////////////////////////////////////////////////////////////// - protected abstract InputStream getInputStream() throws IOException; + public abstract InputStream getInputStream() throws IOException; protected String getCacheKey() throws NotCacheableException { throw new NotCacheableException(); } /** HTTP or HTTPS resource */ + // FEATURE: Only instansiate only ibex.net.HTTP, share with all substreams public static class HTTP extends Stream { private String url; - public String toString() { return "Stream.HTTP:" + url; } - HTTP(String url) { while (url.endsWith("/")) url = url.substring(0, url.length() - 1); this.url = url; } - public Object _get(Object key) { return new HTTP(url + "/" + (String)key); } + public String coerceToString() { return "Stream.HTTP:" + url; } + public HTTP(String url) { while (url.endsWith("/")) url = url.substring(0, url.length() - 1); this.url = url; } + public JS _get(JS key) throws JSExn { return new HTTP(url + "/" + JS.toString(key)); } public String getCacheKey(Vec path) throws NotCacheableException { return url; } - public InputStream getInputStream() throws IOException { return new org.ibex.HTTP(url).GET(); } + public InputStream getInputStream() throws IOException { return new org.ibex.net.HTTP(url).GET(); } } /** byte arrays */ public static class ByteArray extends Stream { private byte[] bytes; private String cacheKey; - ByteArray(byte[] bytes, String cacheKey) { this.bytes = bytes; this.cacheKey = cacheKey; } + public ByteArray(byte[] bytes, String cacheKey) { this.bytes = bytes; this.cacheKey = cacheKey; } public String getCacheKey() throws NotCacheableException { if (cacheKey == null) throw new NotCacheableException(); return cacheKey; } public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(bytes); } @@ -58,25 +57,25 @@ public abstract class Stream extends JS.Cloneable { /** a file */ public static class File extends Stream { private String path; - File(String path) { this.path = path; } - public String toString() { return "file:" + path; } + public File(String path) { this.path = path; } + public String coerceToString() { return "file:" + path; } public String getCacheKey() throws NotCacheableException { throw new NotCacheableException(); /* already on disk */ } public InputStream getInputStream() throws IOException { return new FileInputStream(path); } - public Object _get(Object key) { return new File(path + java.io.File.separatorChar + (String)key); } + public JS _get(JS key) throws JSExn { return new File(path + java.io.File.separatorChar + JS.toString(key)); } } /** "unwrap" a Zip archive */ public static class Zip extends Stream { private Stream parent; private String path; - Zip(Stream parent) { this(parent, null); } - Zip(Stream parent, String path) { + public Zip(Stream parent) { this(parent, null); } + public Zip(Stream parent, String path) { while(path != null && path.startsWith("/")) path = path.substring(1); this.parent = parent; this.path = path; } public String getCacheKey() throws NotCacheableException { return parent.getCacheKey() + "!zip:"; } - public Object _get(Object key) { return new Zip(parent, path==null?(String)key:path+'/'+(String)key); } + public JS _get(JS key) throws JSExn { return new Zip(parent, path==null?JS.toString(key):path+'/'+JS.toString(key)); } public InputStream getInputStream() throws IOException { InputStream pis = parent.getInputStream(); ZipInputStream zis = new ZipInputStream(pis); @@ -91,10 +90,10 @@ public abstract class Stream extends JS.Cloneable { public static class Cab extends Stream { private Stream parent; private String path; - Cab(Stream parent) { this(parent, null); } - Cab(Stream parent, String path) { this.parent = parent; this.path = path; } + public Cab(Stream parent) { this(parent, null); } + public Cab(Stream parent, String path) { this.parent = parent; this.path = path; } public String getCacheKey() throws NotCacheableException { return parent.getCacheKey() + "!cab:"; } - public Object _get(Object key) { return new Cab(parent, path==null?(String)key:path+'/'+(String)key); } + public JS _get(JS key) throws JSExn { return new Cab(parent, path==null?JS.toString(key):path+'/'+JS.toString(key)); } public InputStream getInputStream() throws IOException { return new MSPack(parent.getInputStream()).getInputStream(path); } } @@ -108,7 +107,7 @@ public abstract class Stream extends JS.Cloneable { public static class ProgressWatcher extends Stream { final Stream watchee; JS callback; - ProgressWatcher(Stream watchee, JS callback) { this.watchee = watchee; this.callback = callback; } + public ProgressWatcher(Stream watchee, JS callback) { this.watchee = watchee; this.callback = callback; } public String getCacheKey() throws NotCacheableException { return watchee.getCacheKey(); } public InputStream getInputStream() throws IOException { final InputStream is = watchee.getInputStream(); @@ -122,7 +121,7 @@ public abstract class Stream extends JS.Cloneable { 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() throws IOException, JSExn { + Scheduler.add(new Task() { public void perform() throws IOException, JSExn { callback.call(N(bytesDownloaded), N(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0), null, null, 2); } }); @@ -147,7 +146,7 @@ public abstract class Stream extends JS.Cloneable { if (!disk) { cis = new CachedInputStream(parent.getInputStream()); } else { - java.io.File f = LocalStorage.Cache.getCacheFileForKey(key); + java.io.File f = org.ibex.core.LocalStorage.Cache.getCacheFileForKey(key); if (f.exists()) return new FileInputStream(f); cis = new CachedInputStream(parent.getInputStream(), f); }