etwist/server.py
changeset 151 343e7a18675d
parent 0 b97547f5f1fa
child 1016 26387b836099
child 1115 1a9e386ebdda
--- a/etwist/server.py	Wed Nov 26 15:06:10 2008 +0100
+++ b/etwist/server.py	Wed Nov 26 17:20:58 2008 +0100
@@ -123,11 +123,16 @@
             if segments[0] == 'https':
                 segments = segments[1:]
             if len(segments) >= 2:
-                if segments[0] in (self.versioned_datadir, 'data'):
-                    # Anything in data/ is treated as static files
-                    datadir = self.config.locate_resource(segments[1])
-                    if datadir is None:
-                        return None, []
+                if segments[0] in (self.versioned_datadir, 'data', 'static'):
+                    # Anything in data/, static/ is treated as static files
+                    if segments[0] == 'static':
+                        # instance static directory
+                        datadir = self.config.static_directory
+                    else:
+                        # cube static data file
+                        datadir = self.config.locate_resource(segments[1])
+                        if datadir is None:
+                            return None, []
                     self.info('static file %s from %s', segments[-1], datadir)
                     if segments[0] == 'data':
                         return static.File(str(datadir)), segments[1:]