[projects/buildlogs] And a nicer size + column widths.
arekm
arekm at pld-linux.org
Tue Apr 21 00:26:16 CEST 2026
commit fe8b28769062ee67003b5958b532da86655f181e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Apr 21 00:25:45 2026 +0200
And a nicer size + column widths.
index.php | 28 +++++++++++++++++-----------
lib.php | 10 ++++++++++
2 files changed, 27 insertions(+), 11 deletions(-)
---
diff --git a/index.php b/index.php
index 5008436..0f55e20 100644
--- a/index.php
+++ b/index.php
@@ -446,10 +446,10 @@ function list_logs()
echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(5, _("Dist"))."</th>";
echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(4, _("Arch"))."</th>";
}
- echo "<th bgcolor=\"#CCCCFF\" align=\"left\" valign=\"middle\" width=\"80%\">".$sl(1, _("Log File"))."</th>".
+ echo "<th bgcolor=\"#CCCCFF\" align=\"left\" valign=\"middle\" width=\"55%\">".$sl(1, _("Log File"))."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Failed rpm section")."</th>".
- "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(6, _("Runtime"))."</th>".
- "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\" width=\"15%\">".$sl(2, _("Size"))."</th>".
+ "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(6, _("Build time"))."</th>".
+ "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(2, _("Size"))."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(0, _("Date"))."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(0, _("Age"))."</th>".
"</tr>";
@@ -531,8 +531,8 @@ function list_logs()
"<a href=\"$u&action=tail\">"._("tail")."</a>]".
"</td><td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$section</td>".
"<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$rt</td>".
- "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\">".
- h((string)$s)."</td><td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".
+ "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".
+ format_size((int)$s)."</td><td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".
h($date_str)."</td><td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$t</td></tr>\n";
$i++;
}
@@ -703,7 +703,7 @@ function list_package_history($pkg_name, $cur_dist, $cur_arch, $cur_ok, $cur_id)
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Arch")."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"left\" valign=\"middle\">"._("Log File")."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Failed rpm section")."</th>".
- "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Runtime")."</th>".
+ "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Build time")."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Size")."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Date")."</th>".
"<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Age")."</th>".
@@ -743,7 +743,7 @@ function list_package_history($pkg_name, $cur_dist, $cur_arch, $cur_ok, $cur_id)
"<a href=\"$u&action=tail\">"._("tail")."</a>]</td>".
"<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$section</td>".
"<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$rt</td>".
- "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\">".h((string)$r_size)."</td>".
+ "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".format_size($r_size)."</td>".
"<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".h($date_str)."</td>".
"<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$t_str</td>".
"</tr>\n";
@@ -852,7 +852,9 @@ function dump_log($tail)
one_item(_("rpm -qa of builder"), _("Not available"));
}
if ($log_exists) {
- one_item("Date", date("Y/m/d H:i:s", filemtime($full_path)));
+ $log_mtime = filemtime($full_path);
+ one_item("Date", date("Y/m/d H:i:s", $log_mtime));
+ one_item("Age", format_age(time() - $log_mtime));
} else {
one_item("Date", _("unknown"));
}
@@ -973,7 +975,11 @@ function dump_log($tail)
$code = join('', $out_buf);
if ($time) {
- one_item(_("Runtime"), $time);
+ $parts = explode(':', $time);
+ $secs = (int)array_pop($parts);
+ $secs += 60 * (int)(array_pop($parts) ?? 0);
+ $secs += 3600 * (int)(array_pop($parts) ?? 0);
+ one_item(_("Build time"), format_runtime($secs));
}
echo "</table>";
@@ -1505,7 +1511,7 @@ function adv_search()
echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(4, _("Arch"))."</th>";
echo "<th bgcolor=\"#CCCCFF\" align=\"left\" valign=\"middle\" width=\"60%\">".$sl(1, _("Log File"))."</th>";
echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">"._("Failed rpm section")."</th>";
- echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(6, _("Runtime"))."</th>";
+ echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(6, _("Build time"))."</th>";
echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(2, _("Size"))."</th>";
echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(0, _("Date"))."</th>";
echo "<th bgcolor=\"#CCCCFF\" align=\"center\" valign=\"middle\">".$sl(0, _("Age"))."</th>";
@@ -1540,7 +1546,7 @@ function adv_search()
? "<code>".h($row["build_rpm_section"])."</code>" : "-";
echo "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$section</td>";
echo "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".format_runtime($row["runtime"] ?? null)."</td>";
- echo "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\">".h((string)$r_size)."</td>";
+ echo "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".format_size($r_size)."</td>";
echo "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">".h($date_str)."</td>";
echo "<td bgcolor=\"#CCCCCC\" align=\"center\" valign=\"middle\" nowrap=\"nowrap\">$t_str</td>";
echo "</tr>\n";
diff --git a/lib.php b/lib.php
index fc9c954..b67f217 100644
--- a/lib.php
+++ b/lib.php
@@ -35,6 +35,16 @@ function close_log_stream(array $h): void {
proc_close($h['proc']);
}
+function format_size(int $bytes): string {
+ if ($bytes < 1024) return $bytes . " B";
+ $kb = $bytes / 1024;
+ if ($kb < 1024) return number_format($kb, $kb < 10 ? 1 : 0) . " KiB";
+ $mb = $kb / 1024;
+ if ($mb < 1024) return number_format($mb, $mb < 10 ? 1 : 0) . " MiB";
+ $gb = $mb / 1024;
+ return number_format($gb, $gb < 10 ? 1 : 0) . " GiB";
+}
+
function format_age(int $seconds): string {
if ($seconds < 0) return _("in future");
if ($seconds < 60) return $seconds . "s";
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/buildlogs.git/commitdiff/fe8b28769062ee67003b5958b532da86655f181e
More information about the pld-cvs-commit
mailing list