Changeset 12025 in project

Timestamp:

09/28/08 20:12:58 (12 years ago)

Author:

sjamaan

Message:

Tweak file extension handling

File:

• release/4/spiffy/trunk/spiffy.scm (modified) (4 diffs)

release/4/spiffy/trunk/spiffy.scm

@@ -62 +62 @@
 (define mime-type-map
   (make-parameter
-   '(("txt" . text/plain)
-     ("xml" . text/xml)
-     ("xul" . application/vnd.mozilla.xul+xml)
-     ("htm" . text/html)
+   '(("xml" . text/xml)
      ("html" . text/html)
+     ("xhtml" . text/xhtml+xml)
      ("js"  . text/javascript)
      ("pdf" . application/pdf)
      ("css" . text/css)
-     ("bmp" . image/bmp)
+     ("png" . image/png)
      ("ico" . image/x-icon)
      ("gif" . image/gif)
+     ("jpeg" . image/jpeg)
      ("jpg" . image/jpeg)
-     ("jpeg" . image/jpeg)
-     ("png" . image/png))))
+     ("svg" . image/svg+xml)
+     ("bmp" . image/bmp)
+     ("txt" . text/plain)
+     ("htm" . text/html))))
 (define default-mime-type (make-parameter 'application/octet-stream))
 (define default-host (make-parameter "localhost")) ;; XXX Can we do without?
+(define file-extension-handlers (make-parameter '()))
 
 ;;; Custom handlers
@@ -87 +89 @@
   (make-parameter
    (lambda (path)
-     (with-headers `((content-type ,(extension->mime-type
-                                     (pathname-extension path))))
-       (lambda ()
-         (send-static-file path))))))
+     (let* ((ext (pathname-extension path))
+            (handler (alist-ref ext (file-extension-handlers)
+                                string-ci=? send-static-file)))
+       ;; Should we modify the content-type here or later on?
+       (with-headers `((content-type ,(extension->mime-type ext)))
+         (lambda () (handler path)))))))
 (define handle-not-found
   (make-parameter
@@ -97 +101 @@
                   "The resource you requested could not be found"))))
 
-
 ;;; Internal parameters
 (define request-restarter (make-parameter #f))
+
+(define (extension->mime-type ext)
+  (alist-ref (or ext "") (mime-type-map) string-ci=? (default-mime-type)))
 
 ;; A simple utility procedure to render a status code with message
@@ -136 +142 @@
           (file-close fd))))))
 
-(define (extension->mime-type ext)
-  (alist-ref (or ext "") (mime-type-map) string-ci=? (default-mime-type)))
-
 (define (with-headers new-headers thunk)
   (parameterize ((current-response