Redirect dir -> dir/

[rags.git] / rags.scm

diff --git a/rags.scm b/rags.scm
index 69e7ff6..a06be1c 100644 (file)
--- a/rags.scm
+++ b/rags.scm
@@ -11,7 +11,7 @@
         (chicken process)
         (chicken process-context)
         (chicken process-context posix)
-        matchable srfi-13
+        matchable srfi-13 srfi-1
         uri-common tcp6 openssl)
 
 (define-record config
@@ -19,7 +19,8 @@
 
 (define file-types
   '(("gmi" "text/gemini" "charset=utf-8")
-    ("txt" "text/plain" "charset=utf-8")))
+    ("txt" "text/plain" "charset=utf-8")
+    ("xml" "text/xml" "charset=utf-8")))
 
 (define (process-request config request-line)
   (let ((uri (uri-normalize-path-segments (absolute-uri request-line))))
@@ -34,18 +35,36 @@
       (fail-permanent "Path must be absolute."))
      ((not (document-available? config uri))
       (fail-permanent "Document not found."))
+     ((and (document-path-directory? config uri)
+           (uri-lacks-trailing-slash? uri))
+      (redirect-permanent (uri-with-trailing-slash uri)))
      (else 
       (serve-document config uri)))))
 
 (define (fail-permanent reason)
   (print "50 " reason "\r"))
 
+(define (redirect-permanent new-uri)
+  (print "30 " (uri->string new-uri) "\r"))
+
+(define (uri-lacks-trailing-slash? uri)
+  (not (string-null? (last (uri-path uri)))))
+
+(define (uri-with-trailing-slash uri)
+  (update-uri uri path: (append (uri-path uri) '(""))))
+
 (define (document-available? config uri)
   (file-exists? (document-path config uri)))
 
+(define (document-path-directory? config uri)
+  (directory-exists? (document-path-raw config uri)))
+
+(define (document-path-raw config uri)
+  (let* ((crumbs (reverse (cons (config-root-dir config) (cdr (uri-path uri))))))
+    (make-pathname (reverse (cdr crumbs)) (car crumbs))))
+
 (define (document-path config uri)
-  (let* ((crumbs (reverse (cons (config-root-dir config) (cdr (uri-path uri)))))
-         (path (make-pathname (reverse (cdr crumbs)) (car crumbs))))
+  (let* ((path (document-path-raw config uri)))
     (if (directory-exists? path)
         (make-pathname path "index.gmi")
         path)))
@@ -58,9 +77,8 @@
          (mime-type (cadr mime)))
     (print "20 " (string-intersperse (cdr mime) ";") "\r")
     (cond 
-     ((and (equal? mime-type "text/gemini")
-           (file-executable? path))
-      (serve-text-dynamic path))
+     ((file-executable? path)
+      (serve-text-dynamic path)) ; Binary-files can also be generated here, but the source is dynamic text
      ((string-prefix? "text/" mime-type)
       (serve-text-plain path))
      (else (serve-binary path)))))