Check git location is valid when adding project

[candle] / src / main / server.lisp

diff --git a/src/main/server.lisp b/src/main/server.lisp
index 432c83dffb6ff3338f77fe76e80be88c12034681..163ba5a891b1bd0de5f7b7e9504e2755866ca862 100644 (file)
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -1,17 +1,28 @@
 (in-package #:candle)
 
 (defun server (port &optional (background t))
- (lame-db:load-known-dbs "/home/herbie/.lame-db/data")
- (sb-thread:make-thread
-  (lambda ()
-   (do () (nil)
-    (progn
-     (sleep (* 5 60))
-     (lame-db:save-known-dbs "/home/herbie/.lame-db/data"))))
-  :name "Save Thread")
- (communication:start-listener port background))
+ (when (not *candle-dir*) (error "Need a candle dir"))
+ (let
+  ((data-dir (format nil "~Adata" *candle-dir*)))
+  (ensure-directories-exist *candle-dir*)
+  (ensure-directories-exist data-dir)
+  (lame-db:load-known-dbs data-dir)
+  (sb-thread:make-thread
+   (lambda ()
+    (do () (nil)
+     (progn
+      (sleep (* 5 60))
+      (lame-db:save-known-dbs data-dir))))
+   :name "Save Thread")
+  (communication:start-listener port background)))
 
 (defun add-project (name src)
+ (when
+  (not (cl-ppcre:scan "^[0-9A-Za-z-]*$" name))
+  (error "Name contains invalid characters"))
+ (when
+  (not (git nil "ls-remote" src))
+  (error "Project uri is not a valid git repository"))
  (make-project :name name :src src)
  t)