summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2011-January/001931.html
blob: 9d14b3968c62cb625267960104ff712dcda44b99 (plain)
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
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [269] Import my changes + rda's style
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B269%5D%20Import%20my%20changes%20%2B%20rda%27s%20style&In-Reply-To=%3C20110112114421.EBD68421F5%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="001930.html">
   <LINK REL="Next"  HREF="001932.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [269] Import my changes + rda's style</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B269%5D%20Import%20my%20changes%20%2B%20rda%27s%20style&In-Reply-To=%3C20110112114421.EBD68421F5%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [269] Import my changes + rda's style">root at mageia.org
       </A><BR>
    <I>Wed Jan 12 12:44:21 CET 2011</I>
    <P><UL>
        <LI>Previous message: <A HREF="001930.html">[Mageia-sysadm] [268] Import blino's web interface
</A></li>
        <LI>Next message: <A HREF="001932.html">[Mageia-sysadm] [270] Use a subdirectory for data, to be writable by apache and fix a syntax error
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1931">[ date ]</a>
              <a href="thread.html#1931">[ thread ]</a>
              <a href="subject.html#1931">[ subject ]</a>
              <a href="author.html#1931">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 269
Author:   pterjan
Date:     2011-01-12 12:44:21 +0100 (Wed, 12 Jan 2011)
Log Message:
-----------
Import my changes + rda's style

Modified Paths:
--------------
    build_system/web/index.php

Modified: build_system/web/index.php
===================================================================
--- build_system/web/index.php	2011-01-12 11:42:10 UTC (rev 268)
+++ build_system/web/index.php	2011-01-12 11:44:21 UTC (rev 269)
@@ -12,16 +12,27 @@
 
 $upload_dir = &quot;/home/schedbot/uploads&quot;;
 $max_modified = 2;
-$title = &quot;Mageia build system&quot;;
+$title = &quot;Mageia build system status&quot;;
+$tz = new DateTimeZone(&quot;UTC&quot;);
 
+# Temporary until initial mirror is ready
+$nb_rpm = shell_exec('rpm -qp --qf &quot;%{SOURCERPM}\n&quot; /distrib/bootstrap/distrib/cauldron/i586/media/core/release/*.rpm | sort -u | tee src.txt | wc -l');
+$nb_rpm_mga = shell_exec('grep mga src.txt | tee src.mga.txt | wc -l');
+shell_exec('grep -v mga src.txt &gt; src.mdv.txt');
+#########################################
+
 chdir($upload_dir);
-$all_files = shell_exec(&quot;find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' \) ! -ctime $max_modified&quot;);
 
-preg_match_all(&quot;!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock)$!m&quot;, $all_files, $matches, PREG_SET_ORDER);
+$all_files = shell_exec(&quot;find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' -o -name '*.done' \) ! -ctime $max_modified&quot;);
 
+preg_match_all(&quot;!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock|\.done)$!m&quot;, $all_files, $matches, PREG_SET_ORDER);
+
 $pkgs = array();
 foreach ($matches as $val) {
-    $key = $val[6];
+    if ($_GET[&quot;user&quot;] &amp;&amp; ($_GET[&quot;user&quot;] != $val[7])) {
+		continue;
+    }
+    $key = $val[6] . $val[7];
     if (!is_array($pkgs[$key])) {
         $pkgs[$key] = array();
         $pkgs[$key][&quot;status&quot;]  = array();
@@ -35,8 +46,8 @@
     }
 
     $status = $val[1];
-    $pkgs[$key][&quot;status&quot;][$status] = 1;
     $data = $val[10];
+    $pkgs[$key][&quot;status&quot;][$status] = $data;
     $ext = $val[11];
     if ($ext == &quot;.src.rpm.info&quot;) {
         preg_match(&quot;!^(?:@\d+:)?(.*)!&quot;, $data, $name);
@@ -46,8 +57,9 @@
     } else if ($ext == &quot;.youri&quot;) {
         $pkgs[$key][&quot;status&quot;][&quot;youri&quot;] = 1;
     } else if ($ext == &quot;.lock&quot;) {
+	preg_match(&quot;/(.*)\..*\.(.*)\.\d+\.\d+/&quot;, &quot;(\1@\2)&quot;, $data);
         // parse build bot from $data
-        $pkgs[$key][&quot;status&quot;][&quot;build&quot;] = 1;
+        $pkgs[$key][&quot;status&quot;][&quot;build&quot;] = $data;
     }
 }
 // sort by key in reverse order to have more recent pkgs first
@@ -58,27 +70,33 @@
 &lt;head&gt;
 &lt;title&gt;&lt;? echo $title ?&gt;&lt;/title&gt;
 &lt;style type=&quot;text/css&quot;&gt;
-td.todo {
-  color: black;
+table { 
+    border-spacing: 0;
+    font-family: Helvetica; font-size: 80%;
+    border: 1px solid #ccc;
 }
-td.building {
-  color: fuchsia;
-}
-td.partial {
-  color: purple;
-}
-td.built {
-  color: blue;
-}
-td.youri {
-  color: olive
-}
-td.uploaded {
-  color: green;
-}
-td.failure, td.failure a, td.rejected, td.rejected a {
-  color: red;
-}
+table tr { padding: 0; margin: 0; }
+table th { padding: 0.2em 0.5em; margin: 0; border-bottom: 2px solid #ccc; border-right: 1px solid #ccc; }
+table td { padding: 0; margin: 0; padding: 0.2em 0.5em; border-bottom: 1px solid #ccc; }
+ 
+tr { background: transparent; }
+tr.uploaded { background: #ddffdd; }
+tr.failure, tr.rejected { background: #ffdddd; }
+tr.todo { background: white; }
+tr.building { background: #ffffdd; }
+tr.partial { background: blue; }
+tr.built { background: #00CCFF; }
+tr.youri { background: olive; }
+ 
+td.status-box { width: 1em; height: 1em; }
+tr.uploaded td.status-box { background: green; }
+tr.failure td.status-box, tr.rejected td.status-box { background: red; }
+tr.todo td.status-box { background: white; }
+tr.building td.status-box { background: yellow; }
+tr.partial td.status-box { background: blue; }
+tr.built td.status-box { background: #00CCFF; }
+tr.youri td.status-box { background: olive; }
+ 
 &lt;/style&gt;
 &lt;/head&gt;
 
@@ -107,26 +125,55 @@
     return &quot;unknown&quot;;
 }
 
+function plural($num) {
+    if ($num &gt; 1)
+        return &quot;s&quot;;
+}
+
+function key2date($key) {
+    global $tz;    
+    $date = DateTime::createFromFormat(&quot;YmdHis&quot;, $key+0, $tz);
+    $diff = time() - $date-&gt;getTimestamp();
+    if ($diff&lt;60)
+       return $diff . &quot; second&quot; . plural($diff) . &quot; ago&quot;;
+    $diff = round($diff/60);
+    if ($diff&lt;60)
+       return $diff . &quot; minute&quot; . plural($diff) . &quot; ago&quot;;
+    $diff = round($diff/60);
+    if ($diff&lt;24)
+       return $diff . &quot; hour&quot; . plural($diff) . &quot; ago&quot;;
+    $diff = round($diff/24);
+    return $diff . &quot; day&quot; . plural($diff) . &quot; ago&quot;;
+}
+
+# Temporary until initial mirror is ready
+echo &quot;&lt;a href=\&quot;src.mga.txt\&quot;&gt;$nb_rpm_mga src.rpm&lt;/a&gt; rebuilt for Mageia out of &lt;a href=\&quot;src.txt\&quot;&gt;$nb_rpm&lt;/a&gt;. &lt;a href=\&quot;src.mdv.txt\&quot;&gt;List of Mandriva packages still present&lt;/a&gt;.&lt;br/&gt;\n&quot;;
+#########################################
+
+echo &quot;&lt;tr&gt;&lt;th&gt;Submitted&lt;/th&gt;&lt;th&gt;User&lt;/th&gt;&lt;th&gt;Package&lt;/th&gt;&lt;th&gt;Target&lt;/th&gt;&lt;th&gt;Media&lt;/th&gt;&lt;th colspan=\&quot;2\&quot;&gt;Status&lt;/th&gt;&lt;/tr&gt;\n&quot;;
 foreach ($pkgs as $key =&gt; $p) {
     $p[&quot;type&quot;] = pkg_gettype(&amp;$p);
-    echo &quot;&lt;tr&gt;\n&quot;;
-    echo &quot;&lt;td&gt;&quot; . $p[&quot;user&quot;] . &quot;&lt;/td&gt;\n&quot;;
+    echo &quot;&lt;tr class=&quot; . $p[&quot;type&quot;] . &quot;&gt;\n&quot;;
+    echo &quot;&lt;td&gt;&quot; . key2date($key) . &quot;&lt;/td&gt;\n&quot;;
+    echo &quot;&lt;td&gt;&lt;a href='?user=&quot; . $p[&quot;user&quot;] . &quot;'&gt;&quot; . $p[&quot;user&quot;] . &quot;&lt;/a&gt;&lt;/td&gt;\n&quot;;
     echo &quot;&lt;td&gt;&quot; . $p[&quot;package&quot;] . &quot;&lt;/td&gt;\n&quot;;
     echo &quot;&lt;td&gt;&quot; . $p[&quot;version&quot;] . &quot;&lt;/td&gt;\n&quot;;
     echo &quot;&lt;td&gt;&quot; . $p[&quot;media&quot;] . &quot;/&quot; . $p[&quot;section&quot;] . &quot;&lt;/td&gt;\n&quot;;
+    echo &quot;&lt;td class='status-box' /&gt;\n&quot;;
     $typelink = &quot;&quot;;
     if ($p[&quot;type&quot;] == &quot;failure&quot;) {
        $typelink = &quot;/uploads/&quot; . $p[&quot;type&quot;] . &quot;/&quot; . $p[&quot;path&quot;];
     } else if ($p[&quot;type&quot;] == &quot;rejected&quot;) {
        $typelink = &quot;/uploads/&quot; . $p[&quot;type&quot;] . &quot;/&quot; . $p[&quot;path&quot;] . &quot;.youri&quot;;
     }
-    echo &quot;&lt;td class='&quot; . $p[&quot;type&quot;] . &quot;'&gt;&quot;;
+    echo &quot;&lt;td&gt;&quot;;
     if ($typelink)
         echo &quot;&lt;a href='$typelink'&gt;&quot;;
     echo $p[&quot;type&quot;];
     if ($typelink)
         echo &quot;&lt;/a&gt;&quot;;
-    echo &quot;&lt;/td&gt;\n&quot;;;
+    }
+    echo &quot;&lt;/td&gt;\n&quot;;
     echo &quot;&lt;/tr&gt;\n&quot;;
 }
 ?&gt;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20110112/872f6ea4/attachment-0001.html&gt;
</PRE>












<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="001930.html">[Mageia-sysadm] [268] Import blino's web interface
</A></li>
	<LI>Next message: <A HREF="001932.html">[Mageia-sysadm] [270] Use a subdirectory for data, to be writable by apache and fix a syntax error
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1931">[ date ]</a>
              <a href="thread.html#1931">[ thread ]</a>
              <a href="subject.html#1931">[ subject ]</a>
              <a href="author.html#1931">[ 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>