X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FFountain.java;h=027b86065bd00b5827486f7d30b3900a36de2dd6;hb=c3a9078965e81dc5961040e1d726906db74e6264;hp=264f2ff0b8464be5de9c00dc82887642c7349c12;hpb=a9010e65b3e6bcd993faf55ce8f05d73c20ddff0;p=org.ibex.js.git diff --git a/src/org/ibex/js/Fountain.java b/src/org/ibex/js/Fountain.java index 264f2ff..027b860 100644 --- a/src/org/ibex/js/Fountain.java +++ b/src/org/ibex/js/Fountain.java @@ -1,8 +1,12 @@ -// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the Apache Public Source License 2.0 ("the License"). +// You may not use this file except in compliance with the License. + package org.ibex.js; import java.io.*; import java.util.zip.*; +import org.ibex.js.*; import org.ibex.util.*; import org.ibex.net.*; @@ -12,7 +16,7 @@ import org.ibex.net.*; * be totally independent of the others (ie separate stream position * and state) although they draw from the same data source. */ -public abstract class Fountain extends JS.Cloneable { +public abstract class Fountain extends JS.Obj implements JS.Cloneable { // Public Interface ////////////////////////////////////////////////////////////////////////////// @@ -20,11 +24,10 @@ public abstract class Fountain extends JS.Cloneable { 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); + private Cache getCache = new Cache(100, true); + protected JS _get(JS key) throws JSExn { return null; } + public final JS get(JS key) throws JSExn { + JS ret = (JS)getCache.get(key); if (ret == null) getCache.put(key, ret = _get(key)); return ret; } @@ -37,9 +40,9 @@ public abstract class Fountain extends JS.Cloneable { /** HTTP or HTTPS resource */ public static class HTTP extends Fountain { private String url; - public String toString() { return "Stream.HTTP:" + url; } + //public String toString() { return "Fountain.HTTP:" + url; } public 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 JS _get(JS key) throws JSExn { return new HTTP(url + "/" + JSU.toString(key)); } public String getCacheKey(Vec path) throws NotCacheableException { return url; } public InputStream getInputStream() throws IOException { return new org.ibex.net.HTTP(url).GET(null, null); } } @@ -58,10 +61,10 @@ public abstract class Fountain extends JS.Cloneable { public static class File extends Fountain { private String path; public File(String path) { this.path = path; } - public String toString() { return "file:" + path; } + //public String toString() { 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 + JSU.toString(key)); } } /** "unwrap" a Zip archive */ @@ -75,7 +78,7 @@ public abstract class Fountain extends JS.Cloneable { 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?JSU.toString(key):path+'/'+JSU.toString(key)); } public InputStream getInputStream() throws IOException { InputStream pis = parent.getInputStream(); ZipInputStream zis = new ZipInputStream(pis); @@ -87,32 +90,31 @@ public abstract class Fountain extends JS.Cloneable { } /** "unwrap" a Cab archive */ - /* temporarily disabled due to dependency issues + /* public static class Cab extends Fountain { private Fountain parent; private String path; public Cab(Fountain parent) { this(parent, null); } public Cab(Fountain 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?(String)key:path+'/'+(String)key); } public InputStream getInputStream() throws IOException { return new MSPack(parent.getInputStream()).getInputStream(path); } } */ - /** the Builtin resource */ - /* temporarily disabled due to dependency issues - public static class Builtin extends Fountain { + public static class FromInputStream extends Fountain { + private final InputStream is; + public FromInputStream(InputStream is) { this.is = is; } public String getCacheKey() throws NotCacheableException { throw new NotCacheableException(); } - public InputStream getInputStream() throws IOException { return Platform.getBuiltinInputStream(); } + public InputStream getInputStream() throws IOException { return is; } } - */ /** shadow resource which replaces the graft */ - /* temporarily disabled due to dependency issues public static class ProgressWatcher extends Fountain { + private final JS[] callargs = new JS[2]; final Fountain watchee; - JS callback; - public ProgressWatcher(Fountain watchee, JS callback) { this.watchee = watchee; this.callback = callback; } + Callable callback; + public ProgressWatcher(Fountain watchee, Callable 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(); @@ -126,26 +128,29 @@ public abstract class Fountain 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 Task() { public void perform() throws IOException, JSExn { - callback.call(N(bytesDownloaded), - N(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0), null, null, 2); - } }); + callargs[0] = JSU.N(bytesDownloaded); + callargs[1] = JSU.N(is instanceof KnownLength.KnownLengthInputStream ? + ((KnownLength.KnownLengthInputStream)is).getLength() : 0); + try { + callback.run(callargs); + } catch (Exception e) { + Log.warn(ProgressWatcher.class, e); + } return ret; } }; } } - */ /** subclass from this if you want a CachedInputStream for each path */ - /* temporarily disabled due to dependency issues - public static class CachedStream extends Fountain { + /* + public static class CachedFountain extends Fountain { private Fountain parent; private boolean disk = false; private String key; public String getCacheKey() throws NotCacheableException { return key; } CachedInputStream cis = null; - public CachedStream(Fountain p, String s, boolean d) throws NotCacheableException { + public CachedFountain(Fountain p, String s, boolean d) throws NotCacheableException { this.parent = p; this.disk = d; this.key = p.getCacheKey(); } public InputStream getInputStream() throws IOException { @@ -153,7 +158,7 @@ public abstract class Fountain extends JS.Cloneable { if (!disk) { cis = new CachedInputStream(parent.getInputStream()); } else { - java.io.File f = org.ibex.core.LocalStorage.Cache.getCacheFileForKey(key); + java.io.File f = org.ibex.plat.Platform.LocalStorage.Cache.getCacheFileForKey(key); if (f.exists()) return new FileInputStream(f); cis = new CachedInputStream(parent.getInputStream(), f); }