|
|
|
@@ -1,4 +1,7 @@ |
| |
1 | #include <string-list.h> |
| |
2 | |
1 | #include "cgit.h" |
3 | #include "cgit.h" |
2 | #include "html.h" |
4 | #include "html.h" |
3 | #include <string-list.h> |
5 | #include "ui-shared.h" |
| |
6 | #include "ui-stats.h" |
4 | |
7 | |
@@ -6,19 +9,2 @@ |
6 | |
9 | |
7 | struct Period { |
| |
8 | const char code; |
| |
9 | const char *name; |
| |
10 | int max_periods; |
| |
11 | int count; |
| |
12 | |
| |
13 | /* Convert a tm value to the first day in the period */ |
| |
14 | void (*trunc)(struct tm *tm); |
| |
15 | |
| |
16 | /* Update tm value to start of next/previous period */ |
| |
17 | void (*dec)(struct tm *tm); |
| |
18 | void (*inc)(struct tm *tm); |
| |
19 | |
| |
20 | /* Pretty-print a tm value */ |
| |
21 | char *(*pretty)(struct tm *tm); |
| |
22 | }; |
| |
23 | |
| |
24 | struct authorstat { |
10 | struct authorstat { |
@@ -139,3 +125,3 @@ static char *pretty_year(struct tm *tm) |
139 | |
125 | |
140 | struct Period periods[] = { |
126 | struct cgit_period periods[] = { |
141 | {'w', "week", 12, 4, trunc_week, dec_week, inc_week, pretty_week}, |
127 | {'w', "week", 12, 4, trunc_week, dec_week, inc_week, pretty_week}, |
@@ -146,4 +132,28 @@ struct Period periods[] = { |
146 | |
132 | |
| |
133 | /* Given a period code or name, return a period index (1, 2, 3 or 4) |
| |
134 | * and update the period pointer to the correcsponding struct. |
| |
135 | * If no matching code is found, return 0. |
| |
136 | */ |
| |
137 | int cgit_find_stats_period(const char *expr, struct cgit_period **period) |
| |
138 | { |
| |
139 | int i; |
| |
140 | char code = '\0'; |
| |
141 | |
| |
142 | if (!expr) |
| |
143 | return 0; |
| |
144 | |
| |
145 | if (strlen(expr) == 1) |
| |
146 | code = expr[0]; |
| |
147 | |
| |
148 | for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) |
| |
149 | if (periods[i].code == code || !strcmp(periods[i].name, expr)) { |
| |
150 | if (period) |
| |
151 | *period = &periods[i]; |
| |
152 | return i+1; |
| |
153 | } |
| |
154 | return 0; |
| |
155 | } |
| |
156 | |
147 | static void add_commit(struct string_list *authors, struct commit *commit, |
157 | static void add_commit(struct string_list *authors, struct commit *commit, |
148 | struct Period *period) |
158 | struct cgit_period *period) |
149 | { |
159 | { |
@@ -192,3 +202,3 @@ static int cmp_total_commits(const void *a1, const void *a2) |
192 | struct string_list collect_stats(struct cgit_context *ctx, |
202 | struct string_list collect_stats(struct cgit_context *ctx, |
193 | struct Period *period) |
203 | struct cgit_period *period) |
194 | { |
204 | { |
@@ -235,3 +245,3 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, |
235 | const char *name, const char *leftclass, const char *centerclass, |
245 | const char *name, const char *leftclass, const char *centerclass, |
236 | const char *rightclass, struct Period *period) |
246 | const char *rightclass, struct cgit_period *period) |
237 | { |
247 | { |
@@ -273,3 +283,4 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, |
273 | |
283 | |
274 | void print_authors(struct string_list *authors, int top, struct Period *period) |
284 | void print_authors(struct string_list *authors, int top, |
| |
285 | struct cgit_period *period) |
275 | { |
286 | { |
@@ -341,12 +352,18 @@ void cgit_show_stats(struct cgit_context *ctx) |
341 | struct string_list authors; |
352 | struct string_list authors; |
342 | struct Period *period; |
353 | struct cgit_period *period; |
343 | int top, i; |
354 | int top, i; |
| |
355 | const char *code = "w"; |
344 | |
356 | |
345 | period = &periods[0]; |
357 | if (ctx->qry.period) |
346 | if (ctx->qry.period) { |
358 | code = ctx->qry.period; |
347 | for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) |
359 | |
348 | if (periods[i].code == ctx->qry.period[0]) { |
360 | i = cgit_find_stats_period(code, &period); |
349 | period = &periods[i]; |
361 | if (!i) { |
350 | break; |
362 | cgit_print_error(fmt("Unknown statistics type: %c", code)); |
351 | } |
363 | return; |
| |
364 | } |
| |
365 | if (i > ctx->repo->max_stats) { |
| |
366 | cgit_print_error(fmt("Statistics type disabled: %s", |
| |
367 | period->name)); |
| |
368 | return; |
352 | } |
369 | } |
@@ -370,10 +387,12 @@ void cgit_show_stats(struct cgit_context *ctx) |
370 | htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head); |
387 | htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head); |
371 | html("Period: "); |
388 | if (ctx->repo->max_stats > 1) { |
372 | html("<select name='period' onchange='this.form.submit();'>"); |
389 | html("Period: "); |
373 | for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) |
390 | html("<select name='period' onchange='this.form.submit();'>"); |
374 | htmlf("<option value='%c'%s>%s</option>", |
391 | for (i = 0; i < ctx->repo->max_stats; i++) |
375 | periods[i].code, |
392 | htmlf("<option value='%c'%s>%s</option>", |
376 | period == &periods[i] ? " selected" : "", |
393 | periods[i].code, |
377 | periods[i].name); |
394 | period == &periods[i] ? " selected" : "", |
378 | html("</select><br/><br/>"); |
395 | periods[i].name); |
| |
396 | html("</select><br/><br/>"); |
| |
397 | } |
379 | html("Authors: "); |
398 | html("Authors: "); |
|