X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FRes.java;h=77b502b82e03fce99adeda6a4825e34849832646;hb=8235361e8601ae7b36ab707058de3b52225d15a2;hp=5b1fc5f73d805a225d17406aa5ac354ecbf89b47;hpb=c6069948906645d974f46bdb96617a9a6a504636;p=org.ibex.core.git

diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java
index 5b1fc5f..77b502b 100644
--- a/src/org/xwt/Res.java
+++ b/src/org/xwt/Res.java
@@ -2,30 +2,55 @@
 package org.xwt;
 
 import java.io.*;
+import java.util.*;
+import java.util.zip.*;
 import org.xwt.js.*;
+import org.xwt.util.*;
 
-// FIXME: ByteStream fileName property
 /** base class for XWT resources */
 public abstract class Res extends JS {
 
-    public String toString() { return "Resource, source=FIXME"; }
+    public String getDescriptiveName() { return "FIXME"; }
 
-    public final InputStream getInputStream() { return getInputStream(""); }
+    /** if this Res corresponds to a Template, it is cached here */
+    Template t = null;
 
+    /** cache of subresources so that the equality operator works on them */
+    private Hash refCache = null;
+
+    /** returns an InputStream containing the Resource's contents */
+    public InputStream getInputStream() throws IOException { return getInputStream(""); }
+    public abstract InputStream getInputStream(String path) throws IOException;
+
+    /** graft newResource in place of this resource on its parent */
     public Res graft(Object newResource) { throw new JS.Exn("cannot graft onto this resource"); }
-    public Object get(Object key) { return new Ref(this, key); } 
-    public void put(Object key, Object val) { throw new JS.Exn("cannot put to a resource"); } 
-    public Object[] keys() { throw new JS.Exn("cannot enumerate a resource"); } 
 
-    public abstract InputStream getInputStream(String path) { return getInputStream(""); }
-    public abstract Res addExtension(String extension);
+    /** if the path of this resource does not end with extension, return a new one wit it appended */
+    public Res addExtension(String extension) { return new Ref(this, extension); }
+
+    public Object[] keys() { throw new JS.Exn("cannot enumerate a resource"); } 
+    public void put(Object key, Object val) { throw new JS.Exn("cannot put to a resource"); } 
+    public Object get(Object key) {
+        if ("".equals(key)) {
+            Template t = Template.getTemplate(addExtension(".xwt"));
+            return t == null ? null : t.getStatic();
+        }
+        Object ret = refCache == null ? null : refCache.get(key);
+        if (ret != null) return ret;
+        ret = new Ref(this, key);
+        if (refCache == null) refCache = new Hash();
+        refCache.put(key, ret);
+        return ret;
+    }
 
-    public static Res stringToRes(String url) {
-        if (url.indexOf('!') == -1)
-            return new Zip(stringToRes(url.substring(0, url.lastIndexOf('!'))),
-                           url.substring(url.lastIndexOf('!') + 1));
+    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)));
         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)));
         throw new JS.Exn("invalid resource specifier");
     }
 
@@ -33,14 +58,31 @@ public abstract class Res extends JS {
     public static class HTTP extends Res {
         private String url;
         HTTP(String url) { this.url = url; }
-        public InputStream getInputStream(String path) { return new HTTP(url + path).GET(); }
+        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 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);
+        }
+    }
+
+    /** a file */
+    public static class File extends Res {
+        private String path;
+        File(String path) { this.path = 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() { return parent; }
         public InputStream getInputStream(String path) {
             if (!"".equals(path)) throw new JS.Exn("can't access subresources of IS");
             return parent;
@@ -51,11 +93,12 @@ public abstract class Res extends JS {
     public static class Zip extends Res {
         private Res parent;
         Zip(Res parent) { this.parent = parent; }
-        public InputStream getInputStream(String path) {
+        public InputStream getInputStream(String path) throws IOException {
+            if (path.startsWith("/")) path = path.substring(1);
             ZipInputStream zis = new ZipInputStream(parent.getInputStream());
             ZipEntry ze = zis.getNextEntry();
             while(ze != null && !ze.getName().equals(path)) ze = zis.getNextEntry();
-            if (ze == null) throw new JS.Exn("zip file not found in archive");
+            if (ze == null) throw new JS.Exn("requested file not found in archive");
             return zis;
         }
     }
@@ -65,7 +108,10 @@ public abstract class Res extends JS {
         Res parent;
         Object key;
         Ref(Res parent, Object key) { this.parent = parent; this.key = key; }
-        public InputStream getInputStream(path) {
+        public Res addExtension(String extension) {
+            return (key instanceof String && ((String)key).endsWith(extension)) ? this : new Ref(parent, key + extension);
+        }
+        public InputStream getInputStream(String path) throws IOException {
             return parent.getInputStream("/" + key + path);
         }
         public Res graft(Object newResource) { return new Graft(parent, key, newResource); }
@@ -76,15 +122,39 @@ public abstract class Res extends JS {
         Res graftee;
         Object replaced_key;
         Object replaced_val;
-        Graft(Res graftee, Object key, Object val) {
-            this.graftee = graftee; replaced_key = key; replaced_val = val; }
+        Graft(Res graftee, Object key, Object val) { this.graftee = graftee; replaced_key = key; replaced_val = val; }
         public boolean equals(Object o) { return (this == o || graftee.equals(o)); }
-        public Object get(Object key) {
-            return replaced_key.equals(key) ? replaced_val : graftee.get(key);
-        }
+        public int hashCode() { return graftee.hashCode(); }
+        public InputStream getInputStream(String s) throws IOException { return graftee.getInputStream(s); }
+        public Object get(Object key) { return replaced_key.equals(key) ? replaced_val : graftee.get(key); }
     }
 
-    /////////////// bytestream
+    /** unpacks a Microsoft CAB file (possibly embedded in another file; we scan for 'MSCF' */
+    public static class CAB extends Res {
+        private Res parent;
+        CAB(Res parent) { this.parent = parent; }
+        private int swap_endian(int i) {
+            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;
+            }
+            Log.log(this, "found MSCF header at offset " + ofs);
+            return org.xwt.util.CAB.getFileInputStream(is, path, true);
+        }
+    }
 
     public Object callMethod(Object method, Array args, boolean checkOnly) throws JS.Exn {
         if (method.equals("getUTF")) {
@@ -102,11 +172,11 @@ public abstract class Res extends JS {
                 }
                 return caw.toString();
             } catch (IOException e) {
-                if (Log.on) Log.log(ByteStream.class, "IO Exception while reading from file");
-                if (Log.on) Log.log(ByteStream.class, e);
-                throw new JS.Exn("error while reading from ByteStream");
+                if (Log.on) Log.log(Res.class, "IO Exception while reading from file");
+                if (Log.on) Log.log(Res.class, e);
+                throw new JS.Exn("error while reading from Resource");
             }
-        } else if (name.equals("getDOM")) {
+        } else if (method.equals("getDOM")) {
             if (checkOnly) return Boolean.TRUE;
             if (args.length() != 0) return null;
             return new XMLHelper().doParse();
@@ -155,9 +225,9 @@ public abstract class Res extends JS {
             } catch (XML.XMLException e) {
                 throw new JS.Exn("error parsing XML: " + e.toString());
             } catch (IOException e) {
-                if (Log.on) Log.log(ByteStream.class, "IO Exception while reading from file");
-                if (Log.on) Log.log(ByteStream.class, e);
-                throw new JS.Exn("error reading from ByteStream");
+                if (Log.on) Log.log(this, "IO Exception while reading from file");
+                if (Log.on) Log.log(this, e);
+                throw new JS.Exn("error reading from Resource");
             }
             return obStack.size() >= 1 ? (JS)obStack.elementAt(0) : null;
         }