diff options
Diffstat (limited to 'shared/classes/build.php')
| -rw-r--r-- | shared/classes/build.php | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/shared/classes/build.php b/shared/classes/build.php index 7230673..c863f1f 100644 --- a/shared/classes/build.php +++ b/shared/classes/build.php @@ -59,13 +59,16 @@ class sql_build extends conf_build_common { $perms=$this->visibility == 'public' || owner_or_admin($this->id); $html='<div class="build"><span class="name">'.(isset($this->name) && strlen($this->name)?htmlentities($this->name):'Unnamed Build').'</span> '; $links=array(); - if ($this->status == -128) { + if ($this->status == INGENUE_BUILD_QUEUED) { $total=query('SELECT COUNT(*) FROM `builds` WHERE `status`=-128')->fetch(PDO::FETCH_COLUMN); $num=query('SELECT COUNT(*) FROM `builds` WHERE `status`=-128 AND `ctime` <= '.$this->ctime)->fetch(PDO::FETCH_COLUMN); - $html.="<span class=\"status queued\">[Queued ($num/$total)]</span>"; - } elseif ($this->status == -127) { + $html.="<span class=\"status queued\">[queued ($num/$total)]</span>"; + } elseif ($this->status == INGENUE_BUILD_UPLOADING) { $html.='<span class="status successful">[uploading]</span>'; if ($perms) $links['Build log']="build/$this->id"; + } elseif ($this->status == INGENUE_BUILD_CANCEL) { + $html.='<span class="status queued">[pending cancellation]</span>'; + if ($perms) $links['Build log']="build/$this->id"; } elseif ($this->status < 0) { // TODO Build stage X $html.='<span class="status building">[building]</span>'; @@ -73,26 +76,29 @@ class sql_build extends conf_build_common { //$links['Watch']="build/$this->id/live"; $links['Build Log']="build/$this->id"; } - } elseif ($this->status == 0) { + } elseif ($this->status == INGENUE_BUILD_COMPLETE) { $r=query('SELECT COUNT(*) as `count`, MAX(`time`) as `time` FROM `downloads` WHERE `build`="'.$this->id.'"')->fetch(PDO::FETCH_ASSOC); $d=($perms && $r['count']?'<a href="'.url("build/$this->id/history").'">':'').$r['count'].' download'.($r['count'] != 1?'s':'').($r['count']?($perms?'</a>':'').'<br/><span class="time">(last at '.date($format, $r['time']).')</span>':''); $html.='<span class="downloads">'.$d.'</span><span class="status successful">[successful]</span>'; $links['Download image']="build/$this->id/download"; if ($perms) $links['Build log']="build/$this->id"; - } elseif ($this->status == 127) { + } elseif ($this->status == INGENUE_BUILD_UPLOAD_FAILED) { $html.='<span class="status failed">[upload failed]</span>'; if ($perms) $links['Build log']="build/$this->id"; - } elseif ($this->status == 126) { + } elseif ($this->status == INGENUE_BUILD_FAILED) { $html.='<span class="status failed">[failed]</span>'; if ($perms) { //$links['View output of failed command']="build/$this->id/failure"; $links['Build log']="build/$this->id"; } + } elseif ($this->status == INGENUE_BUILD_CANCELED) { + $html.='<span class="status failed">[canceled]</span>'; + if ($perms) $links['Build log']="build/$this->id"; } else { $html.='<span class="status failed">[failed: got signal '.$this->status.']</span>'; if ($perms) $links['Build log']="build/$this->id"; } - if ($this->status >= 0 || $this->status == -128) // Finished or queued + if ($this->status >= 0 || $this->status == INGENUE_BUILD_QUEUED) // Finished or queued $links['Delete']="build/$this->id/delete"; if ($links) { foreach ($links as $label => $url) { |