1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [301] show package build time
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B301%5D%20show%20package%20build%20time&In-Reply-To=%3C20110114154938.809514247E%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="002089.html">
<LINK REL="Next" HREF="002092.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [301] show package build time</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B301%5D%20show%20package%20build%20time&In-Reply-To=%3C20110114154938.809514247E%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [301] show package build time">root at mageia.org
</A><BR>
<I>Fri Jan 14 16:49:38 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002089.html">[Mageia-sysadm] [300] fix my name
</A></li>
<LI>Next message: <A HREF="002092.html">[Mageia-sysadm] [302] - patch goes in SOURCES no SPECS
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2090">[ date ]</a>
<a href="thread.html#2090">[ thread ]</a>
<a href="subject.html#2090">[ subject ]</a>
<a href="author.html#2090">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 301
Author: rda
Date: 2011-01-14 16:49:38 +0100 (Fri, 14 Jan 2011)
Log Message:
-----------
show package build time
Modified Paths:
--------------
build_system/web/index.php
Modified: build_system/web/index.php
===================================================================
--- build_system/web/index.php 2011-01-14 15:06:29 UTC (rev 300)
+++ build_system/web/index.php 2011-01-14 15:49:38 UTC (rev 301)
@@ -46,10 +46,13 @@
chdir($upload_dir);
-$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' -o -name '*.done' \) -ctime -$max_modified");
+$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' -o -name '*.done' \) ! -ctime $max_modified -printf \"%p\t%T@\"");
+$re = "!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock|\.done)\s+(\d+\.\d+)$!m";
+$r = preg_match_all($re,
+ $all_files,
+ $matches,
+ PREG_SET_ORDER);
-preg_match_all("!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock|\.done)$!m", $all_files, $matches, PREG_SET_ORDER);
-
$pkgs = array();
foreach ($matches as $val) {
@@ -85,6 +88,10 @@
} else if ($ext == '.lock') {
// parse build bot from $data
$pkgs[$key]['status']['build'] = 1;
+ } else if ($ext == '.done') {
+ $pkgs[$key]['buildtime']['start'] = strtotime($val[6]);
+ $pkgs[$key]['buildtime']['end'] = round($val[12]);
+ $pkgs[$key]['buildtime']['diff'] = $pkgs[$key]['buildtime']['end'] - $pkgs[$key]['buildtime']['start'];
}
}
// sort by key in reverse order to have more recent pkgs first
@@ -126,26 +133,38 @@
}
/**
- * @param string $key
+ * Return human-readable time difference:
+ * - against $key (YmdHis expected format)
+ * - using only $diff (takes precedence over $key if provided)
*
+ * @param string $key past date to diff against from now
+ * @param integer $diff time difference in seconds
+ *
* @return string
*/
-function key2date($key) {
- global $tz;
- $date = DateTime::createFromFormat("YmdHis", $key+0, $tz);
- $diff = time() - $date->getTimestamp();
+function key2date($key, $diff = null) {
+ global $tz;
+
+ if (is_null($diff) || $diff <= 0) {
+ $date = DateTime::createFromFormat("YmdHis", $key+0, $tz);
+ if ($date <= 0)
+ return null;
+
+ $diff = time() - $date->getTimestamp();
+ }
if ($diff<60)
- return $diff . " second" . plural($diff) . " ago";
+ return $diff . " second" . plural($diff);
$diff = round($diff/60);
if ($diff<60)
- return $diff . " minute" . plural($diff) . " ago";
+ return $diff . " minute" . plural($diff);
$diff = round($diff/60);
if ($diff<24)
- return $diff . " hour" . plural($diff) . " ago";
+ return $diff . " hour" . plural($diff);
$diff = round($diff/24);
- return $diff . " day" . plural($diff) . " ago";
+ return $diff . " day" . plural($diff);
}
+
?>
<!DOCTYPE html>
<html lang="en">
@@ -256,7 +275,7 @@
$s .= sprintf($tmpl,
$p['type'],
- key2date($key),
+ key2date($key) . ' ago',
$p['user'], $p['user'],
$p['package'],
$p['version'],
@@ -275,6 +294,9 @@
sprintf('<a href="%s">%s</a>', $typelink, $p['type']) :
$p['type'];
+ $s .= '</td><td>';
+ if ($p['type'] == 'uploaded')
+ $s .= duration_to_diff($p['buildtime']['diff']);
$s .= '</td>';
//$s .= '<td>' . sprintf($badges[$p['type']], $p['user']) . '</td>';
$s .= '</tr>';
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110114/43918ddb/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002089.html">[Mageia-sysadm] [300] fix my name
</A></li>
<LI>Next message: <A HREF="002092.html">[Mageia-sysadm] [302] - patch goes in SOURCES no SPECS
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2090">[ date ]</a>
<a href="thread.html#2090">[ thread ]</a>
<a href="subject.html#2090">[ subject ]</a>
<a href="author.html#2090">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
