Include projectname in job output

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index b5fc2980a651690d4387877da815fe325c400aad..bacd1e3d62c7d15a6ede410728b02b0e84fb24a9 100644 (file)
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -10,11 +10,12 @@
  (error-and-exit "Unknown command '~(~A~)'.  See 'candle --help'.~%" command))
 
 (defun job-info->line (job-info)
  (error-and-exit "Unknown command '~(~A~)'.  See 'candle --help'.~%" command))
 
 (defun job-info->line (job-info)

- (format nil "~A (~A) ~A"
-  (subseq (first job-info) 0 8)
+ (format nil "~A:~A (~A) ~A"
+  (first job-info)
+  (subseq (second job-info) 0 8)

   (format nil "~{~2,,,'0@A/~2,,,'0@A/~A ~2,,,'0@A:~2,,,'0@A~}"
   (format nil "~{~2,,,'0@A/~2,,,'0@A/~A ~2,,,'0@A:~2,,,'0@A~}"

-   (utils:time-as-list (third job-info) :month :date :year :hr :min))
-  (case (second job-info)
+   (utils:time-as-list (fourth job-info) :month :date :year :hr :min))
+  (case (third job-info)

    (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc))
    (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc))
    (:queued "In queue")
    (:succeeded (format nil "~c[1;32mPassed~c[0m" #\Esc #\Esc))
    (:failed (format nil "~c[1;31mFailed~c[0m" #\Esc #\Esc))
    (:queued "In queue")


@@ -147,7 +148,7 @@
       (format t (format nil "~~~A@A: ~~A~~%" width)
        (first branch-info)
        (job-info->line (second branch-info))))
       (format t (format nil "~~~A@A: ~~A~~%" width)
        (first branch-info)
        (job-info->line (second branch-info))))

-     (sort branch-infos #'< :key (lambda (branch-info) (third (second branch-info)))))))))
+     (sort branch-infos #'< :key (lambda (branch-info) (fourth (second branch-info)))))))))

 
 (defun refresh-project (args)
  (let
 
 (defun refresh-project (args)
  (let


@@ -212,7 +213,7 @@
    (format t "~{~A~%~}"
     (mapcar
      #'job-info->line
    (format t "~{~A~%~}"
     (mapcar
      #'job-info->line

-     (sort (communication:query `(candle:project-job-information ,(opera:option-argument :project parsed-options))) #'< :key #'third))))))
+     (sort (communication:query `(candle:project-job-information ,(opera:option-argument :project parsed-options))) #'< :key #'fourth))))))

 
 (defun decompose-job-definition (job-definition)
  (let
 
 (defun decompose-job-definition (job-definition)
  (let

diff --git a/src/main/server.lisp b/src/main/server.lisp
index 320ffbda285c2dcfad6da964243779ce155de0ed..3df97f820b7236be8543f1d75680b4a3d496acdc 100644 (file)
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -102,7 +102,7 @@
   (nremove-project project)))
 
 (defun job->job-information (job)
   (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
 
 (defun project-branch-information (name)
  (let