X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FRes.java;h=37cdc29fb5c1b4b989bc45ac77d033518bbd5a77;hb=6b010667b40641fdb82925e56466f847f721ef1f;hp=f0b25bf9c6eee37c3493f4f0395b62b8916df050;hpb=55c3195af733f3de6b7894f4c4a96f7b50f58c11;p=org.ibex.core.git

diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java
index f0b25bf..37cdc29 100644
--- a/src/org/xwt/Res.java
+++ b/src/org/xwt/Res.java
@@ -7,28 +7,52 @@ 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 final InputStream getInputStream() throws IOException { return getInputStream(""); }
+    public String getDescriptiveName() { return ""; }
 
-    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"); } 
+    /** cache of subresources so that the equality operator works on them */
+    private Hash refCache = null;
 
+    public Template t = null;
+
+    public Res getParent() { return null; }
+
+    /** returns an InputStream containing the Resource's contents */
+    public InputStream getInputStream() throws IOException { return getInputStream(""); }
     public abstract InputStream getInputStream(String path) throws IOException;
-    //public abstract Res addExtension(String extension);
 
-    public static Res stringToRes(String url) {
+    /** graft newResource in place of this resource on its parent */
+    public Res graft(Object newResource) { throw new JS.Exn("cannot graft onto this resource"); }
+
+    /** 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) { 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:")) return new File(url.substring(5));
+        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");
+        throw new JS.Exn("invalid resource specifier " + url);
     }
 
     /** HTTP or HTTPS resource */
@@ -38,12 +62,22 @@ public abstract class Res extends JS {
         public InputStream getInputStream(String path) throws IOException { return new org.xwt.HTTP(url + path).GET(); }
     }
 
-    // FIXME: dangerous
+    /** 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)); }
+        public InputStream getInputStream(String rest) throws IOException {
+            return new FileInputStream((path + rest).replace('/', java.io.File.separatorChar)); }
     }
 
     /** wrap a Res around a preexisting InputStream */
@@ -61,10 +95,11 @@ public abstract class Res extends JS {
         private Res parent;
         Zip(Res parent) { this.parent = parent; }
         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;
         }
     }
@@ -74,9 +109,17 @@ public abstract class Res extends JS {
         Res parent;
         Object key;
         Ref(Res parent, Object key) { this.parent = parent; this.key = key; }
+        public String getDescriptiveName() {
+            String pdn = parent.getDescriptiveName();
+            return pdn.equals("") ? key.toString() : (pdn + "." + key.toString());
+        }
+        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 getParent() { return parent; }
         public Res graft(Object newResource) { return new Graft(parent, key, newResource); }
     }
 
@@ -85,14 +128,13 @@ 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 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);
-        }
+        public Object get(Object key) { return replaced_key.equals(key) ? replaced_val : graftee.get(key); }
+        public String getDescriptiveName() { return graftee.getDescriptiveName(); }
+        public Res getParent() { return graftee.getParent(); }
     }
 
     /** unpacks a Microsoft CAB file (possibly embedded in another file; we scan for 'MSCF' */
@@ -103,15 +145,22 @@ public abstract class Res extends JS {
             return ((i & 0xff) << 24) | ((i & 0xff00) << 8) | ((i & 0xff0000) >>> 8) | (i >>> 24);
         }
         public InputStream getInputStream(String path) throws IOException {
-            InputStream is = new InputStream(parent.getInputStream());
+            InputStream is = parent.getInputStream();
             byte[] scan = new byte[4];
-            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;
+            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;
             }
-            return org.xwt.util.CAB.getFileInputStream(is, path);
+            Log.log(this, "found MSCF header at offset " + ofs);
+            return org.xwt.util.CAB.getFileInputStream(is, path, true);
         }
     }