X-Git-Url: https://code.consxy.com/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fserver.lisp;h=409a804417cf3ee0c3521ae58e2a7ce81cb46ec2;hb=20d2b44038975476f7f84a5aa222ef750c38e76d;hp=07f587b0753e356e1528a152adbbd678e43b664d;hpb=3f7d82afc943450315c1884708b88b5e2ae91169;p=candle diff --git a/src/main/server.lisp b/src/main/server.lisp index 07f587b..409a804 100644 --- a/src/main/server.lisp +++ b/src/main/server.lisp @@ -64,33 +64,28 @@ (defun delete-project (name) (let ((project (find name *all-project* :test #'string= :key #'project-name))) - (when (not project) (error "Project does not exists")) + (when (not project) (error "Project does not exist")) (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))) + (defun project-branch-information (name) (let ((project (find name *all-project* :test #'string= :key #'project-name))) - (when (not project) (error "Project does not exists")) + (when (not project) (error "Project does not exist")) (mapcar (lambda (branch) (list (branch-name branch) - (job-status (branch-job branch)) - (job-create-date (branch-job branch)) - (job-sha (branch-job branch)))) + (job->job-information (branch-job branch)))) (remove-if-not #'branch-in-git (find-branch-by-project project))))) (defun project-job-information (name) (let ((project (find name *all-project* :test #'string= :key #'project-name))) - (when (not project) (error "Project does not exists")) - (mapcar - (lambda (job) - (list - (job-sha job) - (job-status job) - (job-create-date job))) - (find-job-by-project project)))) + (when (not project) (error "Project does not exist")) + (mapcar #'job->job-information (find-job-by-project project))))