added dirs in resources

@@ -73,8 +73,9 @@ class WatchDog (multiprocessing.Process) :
             shutdown.set()
             shutdown.set()
 
 
 class BaseHTTPSimulator (Node) :
 class BaseHTTPSimulator (Node) :
-    def __init__ (self, net, port=8000, respatt=[], resdict={}) :
+    def __init__ (self, net, port=8000, respatt=[]) :
         self.res = {}
         self.res = {}
+        dirs = {}
         for cls in reversed(inspect.getmro(self.__class__)[:-2]) :
         for cls in reversed(inspect.getmro(self.__class__)[:-2]) :
             path = os.path.dirname(inspect.getsourcefile(cls))
             path = os.path.dirname(inspect.getsourcefile(cls))
             for pattern in respatt + ["resources/*.js",
             for pattern in respatt + ["resources/*.js",
@@ -82,10 +83,14 @@ class BaseHTTPSimulator (Node) :
                                       "resources/*.html",
                                       "resources/*.html",
                                       "resources/alive.txt"] :
                                       "resources/alive.txt"] :
                 for res in glob.glob(os.path.join(path, pattern)) :
                 for res in glob.glob(os.path.join(path, pattern)) :
-                    with open(res) as infile :
-                        self.res[os.path.basename(res)] = infile.read()
-        self.res.update(resdict)
-        Node.__init__(self, r=ResourceNode(self.res))
+                    if os.path.isfile(res) :
+                        with open(res) as infile :
+                            self.res[os.path.basename(res)] = infile.read()
+                    elif os.path.isdir(res) :
+                        dirs[os.path.basename(res)] = DirNode(res)
+                    else :
+                        raise ValueError("invalid resource %r" % res)
+        Node.__init__(self, r=ResourceNode(self.res, dirs))
         # create HTTP server
         # create HTTP server
         self.port = port
         self.port = port
         while True :
         while True :

@@ -89,8 +89,9 @@ class DirNode (Node) :
         return handler
         return handler
 
 
 class ResourceNode (Node) :
 class ResourceNode (Node) :
-    def __init__ (self, data) :
+    def __init__ (self, data, dirs) :
         self.data = data
         self.data = data
+        self.dirs = dirs
         self.ct = dict((path, mimetypes.guess_type(path)[0]
         self.ct = dict((path, mimetypes.guess_type(path)[0]
                         or "application/octet-stream")
                         or "application/octet-stream")
                        for path in self.data)
                        for path in self.data)
@@ -101,7 +102,12 @@ class ResourceNode (Node) :
                 return self.data[path]
                 return self.data[path]
             return handler
             return handler
         else :
         else :
-            raise HTTPError(httplib.NOT_FOUND)
+            try :
+                base, child = path.split("/", 1)
+                return self.dirs[base][child]
+            except :
+                raise HTTPError(httplib.NOT_FOUND)
+
 
 
 ##
 ##
 ##
 ##