|
|
|
@@ -1,19 +1,25 @@ |
1 | #include <string-list.h> |
1 | #include <string-list.h> |
2 | |
2 | |
3 | #include "cgit.h" |
3 | #include "cgit.h" |
4 | #include "html.h" |
4 | #include "html.h" |
5 | #include "ui-shared.h" |
5 | #include "ui-shared.h" |
6 | #include "ui-stats.h" |
6 | #include "ui-stats.h" |
7 | |
7 | |
| |
8 | #ifdef NO_C99_FORMAT |
| |
9 | #define SZ_FMT "%u" |
| |
10 | #else |
| |
11 | #define SZ_FMT "%zu" |
| |
12 | #endif |
| |
13 | |
8 | #define MONTHS 6 |
14 | #define MONTHS 6 |
9 | |
15 | |
10 | struct authorstat { |
16 | struct authorstat { |
11 | long total; |
17 | long total; |
12 | struct string_list list; |
18 | struct string_list list; |
13 | }; |
19 | }; |
14 | |
20 | |
15 | #define DAY_SECS (60 * 60 * 24) |
21 | #define DAY_SECS (60 * 60 * 24) |
16 | #define WEEK_SECS (DAY_SECS * 7) |
22 | #define WEEK_SECS (DAY_SECS * 7) |
17 | |
23 | |
18 | static void trunc_week(struct tm *tm) |
24 | static void trunc_week(struct tm *tm) |
19 | { |
25 | { |
@@ -274,28 +280,28 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, |
274 | for (j = 0; j < period->count; j++) { |
280 | for (j = 0; j < period->count; j++) { |
275 | tmp = period->pretty(tm); |
281 | tmp = period->pretty(tm); |
276 | period->inc(tm); |
282 | period->inc(tm); |
277 | subtotal = 0; |
283 | subtotal = 0; |
278 | for (i = from; i <= to; i++) { |
284 | for (i = from; i <= to; i++) { |
279 | author = &authors->items[i]; |
285 | author = &authors->items[i]; |
280 | authorstat = author->util; |
286 | authorstat = author->util; |
281 | items = &authorstat->list; |
287 | items = &authorstat->list; |
282 | date = string_list_lookup(items, tmp); |
288 | date = string_list_lookup(items, tmp); |
283 | if (date) |
289 | if (date) |
284 | subtotal += (size_t)date->util; |
290 | subtotal += (size_t)date->util; |
285 | } |
291 | } |
286 | htmlf("<td class='%s'>%d</td>", centerclass, subtotal); |
292 | htmlf("<td class='%s'>%ld</td>", centerclass, subtotal); |
287 | total += subtotal; |
293 | total += subtotal; |
288 | } |
294 | } |
289 | htmlf("<td class='%s'>%d</td></tr>", rightclass, total); |
295 | htmlf("<td class='%s'>%ld</td></tr>", rightclass, total); |
290 | } |
296 | } |
291 | |
297 | |
292 | void print_authors(struct string_list *authors, int top, |
298 | void print_authors(struct string_list *authors, int top, |
293 | struct cgit_period *period) |
299 | struct cgit_period *period) |
294 | { |
300 | { |
295 | struct string_list_item *author; |
301 | struct string_list_item *author; |
296 | struct authorstat *authorstat; |
302 | struct authorstat *authorstat; |
297 | struct string_list *items; |
303 | struct string_list *items; |
298 | struct string_list_item *date; |
304 | struct string_list_item *date; |
299 | time_t now; |
305 | time_t now; |
300 | long i, j, total; |
306 | long i, j, total; |
301 | struct tm *tm; |
307 | struct tm *tm; |
@@ -326,57 +332,57 @@ void print_authors(struct string_list *authors, int top, |
326 | authorstat = author->util; |
332 | authorstat = author->util; |
327 | items = &authorstat->list; |
333 | items = &authorstat->list; |
328 | total = 0; |
334 | total = 0; |
329 | for (j = 0; j < period->count; j++) |
335 | for (j = 0; j < period->count; j++) |
330 | period->dec(tm); |
336 | period->dec(tm); |
331 | for (j = 0; j < period->count; j++) { |
337 | for (j = 0; j < period->count; j++) { |
332 | tmp = period->pretty(tm); |
338 | tmp = period->pretty(tm); |
333 | period->inc(tm); |
339 | period->inc(tm); |
334 | date = string_list_lookup(items, tmp); |
340 | date = string_list_lookup(items, tmp); |
335 | if (!date) |
341 | if (!date) |
336 | html("<td>0</td>"); |
342 | html("<td>0</td>"); |
337 | else { |
343 | else { |
338 | htmlf("<td>%d</td>", date->util); |
344 | htmlf("<td>"SZ_FMT"</td>", (size_t)date->util); |
339 | total += (size_t)date->util; |
345 | total += (size_t)date->util; |
340 | } |
346 | } |
341 | } |
347 | } |
342 | htmlf("<td class='sum'>%d</td></tr>", total); |
348 | htmlf("<td class='sum'>%ld</td></tr>", total); |
343 | } |
349 | } |
344 | |
350 | |
345 | if (top < authors->nr) |
351 | if (top < authors->nr) |
346 | print_combined_authorrow(authors, top, authors->nr - 1, |
352 | print_combined_authorrow(authors, top, authors->nr - 1, |
347 | "Others (%d)", "left", "", "sum", period); |
353 | "Others (%ld)", "left", "", "sum", period); |
348 | |
354 | |
349 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", |
355 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", |
350 | "total", "sum", "sum", period); |
356 | "total", "sum", "sum", period); |
351 | html("</table>"); |
357 | html("</table>"); |
352 | } |
358 | } |
353 | |
359 | |
354 | /* Create a sorted string_list with one entry per author. The util-field |
360 | /* 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 |
361 | * for each author is another string_list which is used to calculate the |
356 | * number of commits per time-interval. |
362 | * number of commits per time-interval. |
357 | */ |
363 | */ |
358 | void cgit_show_stats(struct cgit_context *ctx) |
364 | void cgit_show_stats(struct cgit_context *ctx) |
359 | { |
365 | { |
360 | struct string_list authors; |
366 | struct string_list authors; |
361 | struct cgit_period *period; |
367 | struct cgit_period *period; |
362 | int top, i; |
368 | int top, i; |
363 | const char *code = "w"; |
369 | const char *code = "w"; |
364 | |
370 | |
365 | if (ctx->qry.period) |
371 | if (ctx->qry.period) |
366 | code = ctx->qry.period; |
372 | code = ctx->qry.period; |
367 | |
373 | |
368 | i = cgit_find_stats_period(code, &period); |
374 | i = cgit_find_stats_period(code, &period); |
369 | if (!i) { |
375 | if (!i) { |
370 | cgit_print_error(fmt("Unknown statistics type: %c", code)); |
376 | cgit_print_error(fmt("Unknown statistics type: %c", code[0])); |
371 | return; |
377 | return; |
372 | } |
378 | } |
373 | if (i > ctx->repo->max_stats) { |
379 | if (i > ctx->repo->max_stats) { |
374 | cgit_print_error(fmt("Statistics type disabled: %s", |
380 | cgit_print_error(fmt("Statistics type disabled: %s", |
375 | period->name)); |
381 | period->name)); |
376 | return; |
382 | return; |
377 | } |
383 | } |
378 | authors = collect_stats(ctx, period); |
384 | authors = collect_stats(ctx, period); |
379 | qsort(authors.items, authors.nr, sizeof(struct string_list_item), |
385 | qsort(authors.items, authors.nr, sizeof(struct string_list_item), |
380 | cmp_total_commits); |
386 | cmp_total_commits); |
381 | |
387 | |
382 | top = ctx->qry.ofs; |
388 | top = ctx->qry.ofs; |
|