X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=scratchy.git;a=blobdiff_plain;f=burrower.scm;h=69fafbc4169da3907c6c0ae1b318afe98e12fecd;hp=867a289b87ec8c9aa8d03367a48d735fbeb75937;hb=4bb715363eff4e534a3ccbb1981401118dfa234d;hpb=4baffb335c037973f3748b8e98bd74b61fc82ec8

diff --git a/burrower.scm b/burrower.scm
index 867a289..69fafbc 100644
--- a/burrower.scm
+++ b/burrower.scm
@@ -55,7 +55,7 @@
                       (serve-selector (if (= (string-length selector) 0)
                                           "/"
                                           selector)
-                                      remote-ip config)))
+                                      config)))
                   (print "... served selector '" selector "'. Closing connection."))
               (o (exn)
                  (print-error-message o out-port)
@@ -82,20 +82,20 @@
      ((or (= (string-length l) 0) (string-suffix? "/" l)) 1)
      ((has-suffix? l ".txt" ".org" ".md") 0)
      ((has-suffix? l ".png" ".jpg" ".gif" ".bmp" ".tif" ".tga") 'I)
-     ((has-suffix? l "?") 7)
+     ((has-suffix? l "?.scm") 7)
      (else 9))))
 
 
 ;;; Selector retrieval
 
-(define (serve-selector raw-selector remote-ip config)
+(define (serve-selector raw-selector config)
   (let* ((selector-list (string-split raw-selector "\t"))
          (selector (car selector-list))
          (arguments (cdr selector-list)))
     (case (infer-selector-type selector)
       ((1) (serve-directory selector config))
       ((0) (serve-text-file selector config))
-      ((7) (serve-query selector arguments remote-ip config))
+      ((7) (serve-query selector arguments config))
       (else (serve-binary-file selector config)))))
 
 (define (serve-directory selector config)
@@ -144,9 +144,8 @@
                     (loop (read-byte)))))))
         (error "File not found." file-name))))
 
-(define (serve-query selector arguments remote-ip config)
-  (let ((file-name (make-pathname (config-root-dir config)
-                                  (conc (string-chomp selector "?") ".scm"))))
+(define (serve-query selector arguments config)
+  (let ((file-name (make-pathname (config-root-dir config) selector)))
     (if (and (regular-file? file-name)
              (= (length arguments) 1))
         (with-input-from-file file-name
@@ -155,9 +154,8 @@
              (with-selector-dir
               selector config
               (lambda ()
-                (apply (eval (read))
-                       (list (car arguments) remote-ip)))))))
-        (error "Invalid query."))))
+                (apply (eval (read)) arguments))))))
+        (error "Invalid query." selector arguments))))
 
 
 ;;; Index rendering
@@ -203,7 +201,10 @@
    dir-selector config
    (lambda ()
      (let-values (((in-port out-port id) (process command)))
-       (serve-info-records (string-chomp (read-string #f in-port) "\n"))))))
+       (let ((string (read-string #f in-port)))
+         (if (and (not (eof-object? string))
+                  (> (string-length string) 0))
+             (serve-info-records (string-chomp string "\n"))))))))
 
 (define (serve-expression expression dir-selector config)
   (with-selector-dir
@@ -217,10 +218,15 @@
 (define (with-current-working-directory directory thunk)
   (let ((old-wd (current-directory))
         (result 'none))
-    (change-directory directory)
-    (set! result (thunk))
-    (change-directory old-wd)
-    result))
+    (condition-case
+        (begin
+          (change-directory directory)
+          (set! result (thunk))
+          (change-directory old-wd)
+          result)
+      (o (exn)
+         (change-directory old-wd)
+         (signal o)))))
 
 (define (with-selector-dir selector config thunk)
   (with-current-working-directory