|
|
|
@@ -146,76 +146,76 @@ int cgit_find_stats_period(const char *expr, struct cgit_period **period) |
146 | code = expr[0]; |
146 | code = expr[0]; |
147 | |
147 | |
148 | for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) |
148 | for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) |
149 | if (periods[i].code == code || !strcmp(periods[i].name, expr)) { |
149 | if (periods[i].code == code || !strcmp(periods[i].name, expr)) { |
150 | if (period) |
150 | if (period) |
151 | *period = &periods[i]; |
151 | *period = &periods[i]; |
152 | return i+1; |
152 | return i+1; |
153 | } |
153 | } |
154 | return 0; |
154 | return 0; |
155 | } |
155 | } |
156 | |
156 | |
157 | const char *cgit_find_stats_periodname(int idx) |
157 | const char *cgit_find_stats_periodname(int idx) |
158 | { |
158 | { |
159 | if (idx > 0 && idx < 4) |
159 | if (idx > 0 && idx < 4) |
160 | return periods[idx - 1].name; |
160 | return periods[idx - 1].name; |
161 | else |
161 | else |
162 | return ""; |
162 | return ""; |
163 | } |
163 | } |
164 | |
164 | |
165 | static void add_commit(struct string_list *authors, struct commit *commit, |
165 | static void add_commit(struct string_list *authors, struct commit *commit, |
166 | struct cgit_period *period) |
166 | struct cgit_period *period) |
167 | { |
167 | { |
168 | struct commitinfo *info; |
168 | struct commitinfo *info; |
169 | struct string_list_item *author, *item; |
169 | struct string_list_item *author, *item; |
170 | struct authorstat *authorstat; |
170 | struct authorstat *authorstat; |
171 | struct string_list *items; |
171 | struct string_list *items; |
172 | char *tmp; |
172 | char *tmp; |
173 | struct tm *date; |
173 | struct tm *date; |
174 | time_t t; |
174 | time_t t; |
175 | |
175 | |
176 | info = cgit_parse_commit(commit); |
176 | info = cgit_parse_commit(commit); |
177 | tmp = xstrdup(info->author); |
177 | tmp = xstrdup(info->author); |
178 | author = string_list_insert(tmp, authors); |
178 | author = string_list_insert(authors, tmp); |
179 | if (!author->util) |
179 | if (!author->util) |
180 | author->util = xcalloc(1, sizeof(struct authorstat)); |
180 | author->util = xcalloc(1, sizeof(struct authorstat)); |
181 | else |
181 | else |
182 | free(tmp); |
182 | free(tmp); |
183 | authorstat = author->util; |
183 | authorstat = author->util; |
184 | items = &authorstat->list; |
184 | items = &authorstat->list; |
185 | t = info->committer_date; |
185 | t = info->committer_date; |
186 | date = gmtime(&t); |
186 | date = gmtime(&t); |
187 | period->trunc(date); |
187 | period->trunc(date); |
188 | tmp = xstrdup(period->pretty(date)); |
188 | tmp = xstrdup(period->pretty(date)); |
189 | item = string_list_insert(tmp, items); |
189 | item = string_list_insert(items, tmp); |
190 | if (item->util) |
190 | if (item->util) |
191 | free(tmp); |
191 | free(tmp); |
192 | item->util++; |
192 | item->util++; |
193 | authorstat->total++; |
193 | authorstat->total++; |
194 | cgit_free_commitinfo(info); |
194 | cgit_free_commitinfo(info); |
195 | } |
195 | } |
196 | |
196 | |
197 | static int cmp_total_commits(const void *a1, const void *a2) |
197 | static int cmp_total_commits(const void *a1, const void *a2) |
198 | { |
198 | { |
199 | const struct string_list_item *i1 = a1; |
199 | const struct string_list_item *i1 = a1; |
200 | const struct string_list_item *i2 = a2; |
200 | const struct string_list_item *i2 = a2; |
201 | const struct authorstat *auth1 = i1->util; |
201 | const struct authorstat *auth1 = i1->util; |
202 | const struct authorstat *auth2 = i2->util; |
202 | const struct authorstat *auth2 = i2->util; |
203 | |
203 | |
204 | return auth2->total - auth1->total; |
204 | return auth2->total - auth1->total; |
205 | } |
205 | } |
206 | |
206 | |
207 | /* Walk the commit DAG and collect number of commits per author per |
207 | /* Walk the commit DAG and collect number of commits per author per |
208 | * timeperiod into a nested string_list collection. |
208 | * timeperiod into a nested string_list collection. |
209 | */ |
209 | */ |
210 | struct string_list collect_stats(struct cgit_context *ctx, |
210 | struct string_list collect_stats(struct cgit_context *ctx, |
211 | struct cgit_period *period) |
211 | struct cgit_period *period) |
212 | { |
212 | { |
213 | struct string_list authors; |
213 | struct string_list authors; |
214 | struct rev_info rev; |
214 | struct rev_info rev; |
215 | struct commit *commit; |
215 | struct commit *commit; |
216 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; |
216 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; |
217 | int argc = 3; |
217 | int argc = 3; |
218 | time_t now; |
218 | time_t now; |
219 | long i; |
219 | long i; |
220 | struct tm *tm; |
220 | struct tm *tm; |
221 | char tmp[11]; |
221 | char tmp[11]; |
@@ -250,117 +250,117 @@ struct string_list collect_stats(struct cgit_context *ctx, |
250 | } |
250 | } |
251 | |
251 | |
252 | void print_combined_authorrow(struct string_list *authors, int from, int to, |
252 | void print_combined_authorrow(struct string_list *authors, int from, int to, |
253 | const char *name, const char *leftclass, const char *centerclass, |
253 | const char *name, const char *leftclass, const char *centerclass, |
254 | const char *rightclass, struct cgit_period *period) |
254 | const char *rightclass, struct cgit_period *period) |
255 | { |
255 | { |
256 | struct string_list_item *author; |
256 | struct string_list_item *author; |
257 | struct authorstat *authorstat; |
257 | struct authorstat *authorstat; |
258 | struct string_list *items; |
258 | struct string_list *items; |
259 | struct string_list_item *date; |
259 | struct string_list_item *date; |
260 | time_t now; |
260 | time_t now; |
261 | long i, j, total, subtotal; |
261 | long i, j, total, subtotal; |
262 | struct tm *tm; |
262 | struct tm *tm; |
263 | char *tmp; |
263 | char *tmp; |
264 | |
264 | |
265 | time(&now); |
265 | time(&now); |
266 | tm = gmtime(&now); |
266 | tm = gmtime(&now); |
267 | period->trunc(tm); |
267 | period->trunc(tm); |
268 | for (i = 1; i < period->count; i++) |
268 | for (i = 1; i < period->count; i++) |
269 | period->dec(tm); |
269 | period->dec(tm); |
270 | |
270 | |
271 | total = 0; |
271 | total = 0; |
272 | htmlf("<tr><td class='%s'>%s</td>", leftclass, |
272 | htmlf("<tr><td class='%s'>%s</td>", leftclass, |
273 | fmt(name, to - from + 1)); |
273 | fmt(name, to - from + 1)); |
274 | for (j = 0; j < period->count; j++) { |
274 | for (j = 0; j < period->count; j++) { |
275 | tmp = period->pretty(tm); |
275 | tmp = period->pretty(tm); |
276 | period->inc(tm); |
276 | period->inc(tm); |
277 | subtotal = 0; |
277 | subtotal = 0; |
278 | for (i = from; i <= to; i++) { |
278 | for (i = from; i <= to; i++) { |
279 | author = &authors->items[i]; |
279 | author = &authors->items[i]; |
280 | authorstat = author->util; |
280 | authorstat = author->util; |
281 | items = &authorstat->list; |
281 | items = &authorstat->list; |
282 | date = string_list_lookup(tmp, items); |
282 | date = string_list_lookup(items, tmp); |
283 | if (date) |
283 | if (date) |
284 | subtotal += (size_t)date->util; |
284 | subtotal += (size_t)date->util; |
285 | } |
285 | } |
286 | htmlf("<td class='%s'>%d</td>", centerclass, subtotal); |
286 | htmlf("<td class='%s'>%d</td>", centerclass, subtotal); |
287 | total += subtotal; |
287 | total += subtotal; |
288 | } |
288 | } |
289 | htmlf("<td class='%s'>%d</td></tr>", rightclass, total); |
289 | htmlf("<td class='%s'>%d</td></tr>", rightclass, total); |
290 | } |
290 | } |
291 | |
291 | |
292 | void print_authors(struct string_list *authors, int top, |
292 | void print_authors(struct string_list *authors, int top, |
293 | struct cgit_period *period) |
293 | struct cgit_period *period) |
294 | { |
294 | { |
295 | struct string_list_item *author; |
295 | struct string_list_item *author; |
296 | struct authorstat *authorstat; |
296 | struct authorstat *authorstat; |
297 | struct string_list *items; |
297 | struct string_list *items; |
298 | struct string_list_item *date; |
298 | struct string_list_item *date; |
299 | time_t now; |
299 | time_t now; |
300 | long i, j, total; |
300 | long i, j, total; |
301 | struct tm *tm; |
301 | struct tm *tm; |
302 | char *tmp; |
302 | char *tmp; |
303 | |
303 | |
304 | time(&now); |
304 | time(&now); |
305 | tm = gmtime(&now); |
305 | tm = gmtime(&now); |
306 | period->trunc(tm); |
306 | period->trunc(tm); |
307 | for (i = 1; i < period->count; i++) |
307 | for (i = 1; i < period->count; i++) |
308 | period->dec(tm); |
308 | period->dec(tm); |
309 | |
309 | |
310 | html("<table class='stats'><tr><th>Author</th>"); |
310 | html("<table class='stats'><tr><th>Author</th>"); |
311 | for (j = 0; j < period->count; j++) { |
311 | for (j = 0; j < period->count; j++) { |
312 | tmp = period->pretty(tm); |
312 | tmp = period->pretty(tm); |
313 | htmlf("<th>%s</th>", tmp); |
313 | htmlf("<th>%s</th>", tmp); |
314 | period->inc(tm); |
314 | period->inc(tm); |
315 | } |
315 | } |
316 | html("<th>Total</th></tr>\n"); |
316 | html("<th>Total</th></tr>\n"); |
317 | |
317 | |
318 | if (top <= 0 || top > authors->nr) |
318 | if (top <= 0 || top > authors->nr) |
319 | top = authors->nr; |
319 | top = authors->nr; |
320 | |
320 | |
321 | for (i = 0; i < top; i++) { |
321 | for (i = 0; i < top; i++) { |
322 | author = &authors->items[i]; |
322 | author = &authors->items[i]; |
323 | html("<tr><td class='left'>"); |
323 | html("<tr><td class='left'>"); |
324 | html_txt(author->string); |
324 | html_txt(author->string); |
325 | html("</td>"); |
325 | html("</td>"); |
326 | authorstat = author->util; |
326 | authorstat = author->util; |
327 | items = &authorstat->list; |
327 | items = &authorstat->list; |
328 | total = 0; |
328 | total = 0; |
329 | for (j = 0; j < period->count; j++) |
329 | for (j = 0; j < period->count; j++) |
330 | period->dec(tm); |
330 | period->dec(tm); |
331 | for (j = 0; j < period->count; j++) { |
331 | for (j = 0; j < period->count; j++) { |
332 | tmp = period->pretty(tm); |
332 | tmp = period->pretty(tm); |
333 | period->inc(tm); |
333 | period->inc(tm); |
334 | date = string_list_lookup(tmp, items); |
334 | date = string_list_lookup(items, tmp); |
335 | if (!date) |
335 | if (!date) |
336 | html("<td>0</td>"); |
336 | html("<td>0</td>"); |
337 | else { |
337 | else { |
338 | htmlf("<td>%d</td>", date->util); |
338 | htmlf("<td>%d</td>", date->util); |
339 | total += (size_t)date->util; |
339 | total += (size_t)date->util; |
340 | } |
340 | } |
341 | } |
341 | } |
342 | htmlf("<td class='sum'>%d</td></tr>", total); |
342 | htmlf("<td class='sum'>%d</td></tr>", total); |
343 | } |
343 | } |
344 | |
344 | |
345 | if (top < authors->nr) |
345 | if (top < authors->nr) |
346 | print_combined_authorrow(authors, top, authors->nr - 1, |
346 | print_combined_authorrow(authors, top, authors->nr - 1, |
347 | "Others (%d)", "left", "", "sum", period); |
347 | "Others (%d)", "left", "", "sum", period); |
348 | |
348 | |
349 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", |
349 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", |
350 | "total", "sum", "sum", period); |
350 | "total", "sum", "sum", period); |
351 | html("</table>"); |
351 | html("</table>"); |
352 | } |
352 | } |
353 | |
353 | |
354 | /* Create a sorted string_list with one entry per author. The util-field |
354 | /* Create a sorted string_list with one entry per author. The util-field |
355 | * for each author is another string_list which is used to calculate the |
355 | * for each author is another string_list which is used to calculate the |
356 | * number of commits per time-interval. |
356 | * number of commits per time-interval. |
357 | */ |
357 | */ |
358 | void cgit_show_stats(struct cgit_context *ctx) |
358 | void cgit_show_stats(struct cgit_context *ctx) |
359 | { |
359 | { |
360 | struct string_list authors; |
360 | struct string_list authors; |
361 | struct cgit_period *period; |
361 | struct cgit_period *period; |
362 | int top, i; |
362 | int top, i; |
363 | const char *code = "w"; |
363 | const char *code = "w"; |
364 | |
364 | |
365 | if (ctx->qry.period) |
365 | if (ctx->qry.period) |
366 | code = ctx->qry.period; |
366 | code = ctx->qry.period; |
|