2003/10/28 10:10:17

[org.ibex.core.git] / src / org / xwt / Res.java

diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java
index 60a9437..54bebcb 100644 (file)
--- a/src/org/xwt/Res.java
+++ b/src/org/xwt/Res.java
@@ -69,9 +69,12 @@ public abstract class Res extends JS {
     }
 
     public static Res stringToRes(String url) {
-        if (url.indexOf('!') != -1)
-            return (Res)(new Zip(stringToRes(url.substring(0, url.lastIndexOf('!')))).
-                         get(url.substring(url.lastIndexOf('!') + 1)));
+        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("cab:")) return new CAB(stringToRes(url.substring(4)));
@@ -98,6 +101,7 @@ public abstract class Res extends JS {
     public static class HTTP extends CachedRes {
         private String url;
         HTTP(String url) { this.url = url; }
+        public String getDescriptiveName() { return url; }
         public InputStream _getInputStream(String path) throws IOException {
             return new org.xwt.HTTP(url + path).GET(); }
     }
@@ -106,6 +110,7 @@ public abstract class Res extends JS {
     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);
@@ -116,6 +121,7 @@ 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)); }
     }
@@ -124,13 +130,15 @@ public abstract class Res extends JS {
     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 (" + path + ") not found in archive");
-            return zis;
+            return new KnownLength.KnownLengthInputStream(zis, (int)ze.getSize());
         }
     }
 
@@ -180,11 +188,13 @@ public abstract class Res extends JS {
 
     /** shadow resource which replaces the graft */
     public static class ProgressWatcher extends Res {
-        Res watchee;
+        final Res watchee;
         JS.Callable callback;
         ProgressWatcher(Res watchee, JS.Callable callback) { this.watchee = watchee; this.callback = callback; }
+        public String getDescriptiveName() { return watchee.getDescriptiveName(); }
         public InputStream getInputStream(String s) throws IOException {
-            return new FilterInputStream(watchee.getInputStream(s)) {
+            final InputStream is = watchee.getInputStream(s);
+            return new FilterInputStream(is) {
                     int bytesDownloaded = 0;
                     public int read() throws IOException {
                         int ret = super.read();
@@ -197,6 +207,7 @@ public abstract class Res extends JS {
                         ThreadMessage.newthread(new JS.Callable() { public Object call(JS.Array a) {
                             JS.Array args = new JS.Array();
                             args.addElement(new Integer(bytesDownloaded));
+                            args.addElement(new Integer(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0));
                             callback.call(args);
                             return null;
                         } });