X-Git-Url: https://code.consxy.com/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fserver.lisp;h=3df97f820b7236be8543f1d75680b4a3d496acdc;hb=2a45e9d6f9b421e06095281ad47c127db3b8b476;hp=ffd6e82ce1749f66093a62a210bce636b68f7ab5;hpb=92a8cc8928e1f5d6aa13708b35cb4551aa736a37;p=candle

diff --git a/src/main/server.lisp b/src/main/server.lisp
index ffd6e82..3df97f8 100644
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -44,16 +44,22 @@
     (sb-thread:join-thread save-thread))
    sb-ext:*exit-hooks*)))
 
+(defun find-project-by-name-or-die (name)
+ (when name
+  (or
+   (find name *all-project* :test #'string= :key #'project-name)
+   (raise-candle-error :project-does-not-exist))))
+
 (defun add-project (name src)
  (when
   (not (cl-ppcre:scan "^[0-9A-Za-z-]*$" name))
-  (error "Name contains invalid characters"))
+  (raise-candle-error :invalid-project-name))
  (when
   (not (git nil "ls-remote" src))
-  (error "Project uri is not a valid git repository"))
+  (raise-candle-error :invalid-project-uri))
  (when
   (find name *all-project* :test #'string= :key #'project-name)
-  (error "Project name already taken"))
+  (raise-candle-error :project-name-taken))
  (let
   ((project (make-project :name name :src src)))
   (ensure-directories-exist (project-dir project))
@@ -63,12 +69,12 @@
 
 (defun refresh-project (name)
  (let*
-  ((project (find name *all-project* :test #'string= :key #'project-name))
+  ((project (find-project-by-name-or-die name))
    (branches (find-branch-by-project project)))
   (git project "fetch" "origin" "--prune")
   (multiple-value-bind (success code out err) (git project "branch" "-r" "--format" "%(refname) %(objectname)" "--list" "origin/*")
    (declare (ignore code err))
-   (when (not success) (error "Failed to get branches"))
+   (when (not success) (raise-candle-error :project-failed-to-get-branches))
    (mapcar (lambda (branch) (set-branch-in-git branch nil)) branches)
    (mapcar
     (lambda (line)
@@ -89,20 +95,18 @@
 
 (defun delete-project (name)
  (let
-  ((project (find name *all-project* :test #'string= :key #'project-name)))
-  (when (not project) (error "Project does not exist"))
+  ((project (find-project-by-name-or-die name)))
   (sb-ext:delete-directory (project-dir project) :recursive t)
   (mapcar #'nremove-job (find-job-by-project project))
   (mapcar #'nremove-branch (find-branch-by-project project))
   (nremove-project project)))
 
 (defun job->job-information (job)
- (list (job-sha job) (job-status job) (job-create-date job)))
+ (list (project-name (job-project job)) (job-sha job) (job-status job) (job-create-date job)))
 
 (defun project-branch-information (name)
  (let
-  ((project (find name *all-project* :test #'string= :key #'project-name)))
-  (when (not project) (error "Project does not exist"))
+  ((project (find-project-by-name-or-die name)))
   (mapcar
    (lambda (branch)
     (list
@@ -112,8 +116,7 @@
 
 (defun project-job-information (name)
  (let
-  ((project (when name (find name *all-project* :test #'string= :key #'project-name))))
-  (when (and name (not project)) (error "Project does not exist"))
+  ((project (find-project-by-name-or-die name)))
   (mapcar #'job->job-information
    (if project
     (find-job-by-project project)
@@ -129,8 +132,7 @@
        (and (<= (length sha) (length job-sha)) (string= sha (subseq job-sha 0 (length sha)))))
      (find-job-by-project project)
      :key #'job-sha))))
-  (when (not project) (error "Project does not exist"))
-  (when (not job) (error "Job does not exist"))
+  (when (not job) (raise-candle-error :job-does-not-exist))
   job))
 
 (defun get-job-log (project-name sha)
@@ -145,14 +147,14 @@
   (lambda (project)
    (list
     (project-name project)
-    (project-src project)))
+    (project-src project)
+    (failures (project-name project))))
   *all-project*))
 
 (defun failures (project-name)
- (length
-  (remove-if-not
-   (lambda (branch) (eql :failed (job-status (branch-job branch))))
-   (if project-name
-     (find-branch-by-project
-      (find project-name *all-project* :test #'string= :key #'project-name))
-     *all-branch*))))
+ (let
+  ((project (find-project-by-name-or-die project-name)))
+  (length
+   (remove-if-not
+    (lambda (branch) (eql :failed (job-status (branch-job branch))))
+    (if project (find-branch-by-project project) *all-branch*)))))