|
|
|
@@ -1,39 +1,25 @@ |
| |
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 | |
5 | #define MONTHS 6 |
8 | #define MONTHS 6 |
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 { |
25 | long total; |
11 | long total; |
26 | struct string_list list; |
12 | struct string_list list; |
27 | }; |
13 | }; |
28 | |
14 | |
29 | #define DAY_SECS (60 * 60 * 24) |
15 | #define DAY_SECS (60 * 60 * 24) |
30 | #define WEEK_SECS (DAY_SECS * 7) |
16 | #define WEEK_SECS (DAY_SECS * 7) |
31 | |
17 | |
32 | static void trunc_week(struct tm *tm) |
18 | static void trunc_week(struct tm *tm) |
33 | { |
19 | { |
34 | time_t t = timegm(tm); |
20 | time_t t = timegm(tm); |
35 | t -= ((tm->tm_wday + 6) % 7) * DAY_SECS; |
21 | t -= ((tm->tm_wday + 6) % 7) * DAY_SECS; |
36 | gmtime_r(&t, tm); |
22 | gmtime_r(&t, tm); |
37 | } |
23 | } |
38 | |
24 | |
39 | static void dec_week(struct tm *tm) |
25 | static void dec_week(struct tm *tm) |
@@ -124,41 +110,65 @@ static void trunc_year(struct tm *tm) |
124 | |
110 | |
125 | static void dec_year(struct tm *tm) |
111 | static void dec_year(struct tm *tm) |
126 | { |
112 | { |
127 | tm->tm_year--; |
113 | tm->tm_year--; |
128 | } |
114 | } |
129 | |
115 | |
130 | static void inc_year(struct tm *tm) |
116 | static void inc_year(struct tm *tm) |
131 | { |
117 | { |
132 | tm->tm_year++; |
118 | tm->tm_year++; |
133 | } |
119 | } |
134 | |
120 | |
135 | static char *pretty_year(struct tm *tm) |
121 | static char *pretty_year(struct tm *tm) |
136 | { |
122 | { |
137 | return fmt("%d", tm->tm_year + 1900); |
123 | return fmt("%d", tm->tm_year + 1900); |
138 | } |
124 | } |
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}, |
142 | {'m', "month", 12, 4, trunc_month, dec_month, inc_month, pretty_month}, |
128 | {'m', "month", 12, 4, trunc_month, dec_month, inc_month, pretty_month}, |
143 | {'q', "quarter", 12, 4, trunc_quarter, dec_quarter, inc_quarter, pretty_quarter}, |
129 | {'q', "quarter", 12, 4, trunc_quarter, dec_quarter, inc_quarter, pretty_quarter}, |
144 | {'y', "year", 12, 4, trunc_year, dec_year, inc_year, pretty_year}, |
130 | {'y', "year", 12, 4, trunc_year, dec_year, inc_year, pretty_year}, |
145 | }; |
131 | }; |
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 | { |
150 | struct commitinfo *info; |
160 | struct commitinfo *info; |
151 | struct string_list_item *author, *item; |
161 | struct string_list_item *author, *item; |
152 | struct authorstat *authorstat; |
162 | struct authorstat *authorstat; |
153 | struct string_list *items; |
163 | struct string_list *items; |
154 | char *tmp; |
164 | char *tmp; |
155 | struct tm *date; |
165 | struct tm *date; |
156 | time_t t; |
166 | time_t t; |
157 | |
167 | |
158 | info = cgit_parse_commit(commit); |
168 | info = cgit_parse_commit(commit); |
159 | tmp = xstrdup(info->author); |
169 | tmp = xstrdup(info->author); |
160 | author = string_list_insert(tmp, authors); |
170 | author = string_list_insert(tmp, authors); |
161 | if (!author->util) |
171 | if (!author->util) |
162 | author->util = xcalloc(1, sizeof(struct authorstat)); |
172 | author->util = xcalloc(1, sizeof(struct authorstat)); |
163 | else |
173 | else |
164 | free(tmp); |
174 | free(tmp); |
@@ -177,33 +187,33 @@ static void add_commit(struct string_list *authors, struct commit *commit, |
177 | } |
187 | } |
178 | |
188 | |
179 | static int cmp_total_commits(const void *a1, const void *a2) |
189 | static int cmp_total_commits(const void *a1, const void *a2) |
180 | { |
190 | { |
181 | const struct string_list_item *i1 = a1; |
191 | const struct string_list_item *i1 = a1; |
182 | const struct string_list_item *i2 = a2; |
192 | const struct string_list_item *i2 = a2; |
183 | const struct authorstat *auth1 = i1->util; |
193 | const struct authorstat *auth1 = i1->util; |
184 | const struct authorstat *auth2 = i2->util; |
194 | const struct authorstat *auth2 = i2->util; |
185 | |
195 | |
186 | return auth2->total - auth1->total; |
196 | return auth2->total - auth1->total; |
187 | } |
197 | } |
188 | |
198 | |
189 | /* Walk the commit DAG and collect number of commits per author per |
199 | /* Walk the commit DAG and collect number of commits per author per |
190 | * timeperiod into a nested string_list collection. |
200 | * timeperiod into a nested string_list collection. |
191 | */ |
201 | */ |
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 | { |
195 | struct string_list authors; |
205 | struct string_list authors; |
196 | struct rev_info rev; |
206 | struct rev_info rev; |
197 | struct commit *commit; |
207 | struct commit *commit; |
198 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; |
208 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; |
199 | int argc = 3; |
209 | int argc = 3; |
200 | time_t now; |
210 | time_t now; |
201 | long i; |
211 | long i; |
202 | struct tm *tm; |
212 | struct tm *tm; |
203 | char tmp[11]; |
213 | char tmp[11]; |
204 | |
214 | |
205 | time(&now); |
215 | time(&now); |
206 | tm = gmtime(&now); |
216 | tm = gmtime(&now); |
207 | period->trunc(tm); |
217 | period->trunc(tm); |
208 | for (i = 1; i < period->count; i++) |
218 | for (i = 1; i < period->count; i++) |
209 | period->dec(tm); |
219 | period->dec(tm); |
@@ -220,33 +230,33 @@ struct string_list collect_stats(struct cgit_context *ctx, |
220 | rev.no_merges = 1; |
230 | rev.no_merges = 1; |
221 | rev.verbose_header = 1; |
231 | rev.verbose_header = 1; |
222 | rev.show_root_diff = 0; |
232 | rev.show_root_diff = 0; |
223 | setup_revisions(argc, argv, &rev, NULL); |
233 | setup_revisions(argc, argv, &rev, NULL); |
224 | prepare_revision_walk(&rev); |
234 | prepare_revision_walk(&rev); |
225 | memset(&authors, 0, sizeof(authors)); |
235 | memset(&authors, 0, sizeof(authors)); |
226 | while ((commit = get_revision(&rev)) != NULL) { |
236 | while ((commit = get_revision(&rev)) != NULL) { |
227 | add_commit(&authors, commit, period); |
237 | add_commit(&authors, commit, period); |
228 | free(commit->buffer); |
238 | free(commit->buffer); |
229 | free_commit_list(commit->parents); |
239 | free_commit_list(commit->parents); |
230 | } |
240 | } |
231 | return authors; |
241 | return authors; |
232 | } |
242 | } |
233 | |
243 | |
234 | void print_combined_authorrow(struct string_list *authors, int from, int to, |
244 | 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 | { |
238 | struct string_list_item *author; |
248 | struct string_list_item *author; |
239 | struct authorstat *authorstat; |
249 | struct authorstat *authorstat; |
240 | struct string_list *items; |
250 | struct string_list *items; |
241 | struct string_list_item *date; |
251 | struct string_list_item *date; |
242 | time_t now; |
252 | time_t now; |
243 | long i, j, total, subtotal; |
253 | long i, j, total, subtotal; |
244 | struct tm *tm; |
254 | struct tm *tm; |
245 | char *tmp; |
255 | char *tmp; |
246 | |
256 | |
247 | time(&now); |
257 | time(&now); |
248 | tm = gmtime(&now); |
258 | tm = gmtime(&now); |
249 | period->trunc(tm); |
259 | period->trunc(tm); |
250 | for (i = 1; i < period->count; i++) |
260 | for (i = 1; i < period->count; i++) |
251 | period->dec(tm); |
261 | period->dec(tm); |
252 | |
262 | |
@@ -258,33 +268,34 @@ void print_combined_authorrow(struct string_list *authors, int from, int to, |
258 | period->inc(tm); |
268 | period->inc(tm); |
259 | subtotal = 0; |
269 | subtotal = 0; |
260 | for (i = from; i <= to; i++) { |
270 | for (i = from; i <= to; i++) { |
261 | author = &authors->items[i]; |
271 | author = &authors->items[i]; |
262 | authorstat = author->util; |
272 | authorstat = author->util; |
263 | items = &authorstat->list; |
273 | items = &authorstat->list; |
264 | date = string_list_lookup(tmp, items); |
274 | date = string_list_lookup(tmp, items); |
265 | if (date) |
275 | if (date) |
266 | subtotal += (size_t)date->util; |
276 | subtotal += (size_t)date->util; |
267 | } |
277 | } |
268 | htmlf("<td class='%s'>%d</td>", centerclass, subtotal); |
278 | htmlf("<td class='%s'>%d</td>", centerclass, subtotal); |
269 | total += subtotal; |
279 | total += subtotal; |
270 | } |
280 | } |
271 | htmlf("<td class='%s'>%d</td></tr>", rightclass, total); |
281 | htmlf("<td class='%s'>%d</td></tr>", rightclass, total); |
272 | } |
282 | } |
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 | { |
276 | struct string_list_item *author; |
287 | struct string_list_item *author; |
277 | struct authorstat *authorstat; |
288 | struct authorstat *authorstat; |
278 | struct string_list *items; |
289 | struct string_list *items; |
279 | struct string_list_item *date; |
290 | struct string_list_item *date; |
280 | time_t now; |
291 | time_t now; |
281 | long i, j, total; |
292 | long i, j, total; |
282 | struct tm *tm; |
293 | struct tm *tm; |
283 | char *tmp; |
294 | char *tmp; |
284 | |
295 | |
285 | time(&now); |
296 | time(&now); |
286 | tm = gmtime(&now); |
297 | tm = gmtime(&now); |
287 | period->trunc(tm); |
298 | period->trunc(tm); |
288 | for (i = 1; i < period->count; i++) |
299 | for (i = 1; i < period->count; i++) |
289 | period->dec(tm); |
300 | period->dec(tm); |
290 | |
301 | |
@@ -326,67 +337,75 @@ void print_authors(struct string_list *authors, int top, struct Period *period) |
326 | if (top < authors->nr) |
337 | if (top < authors->nr) |
327 | print_combined_authorrow(authors, top, authors->nr - 1, |
338 | print_combined_authorrow(authors, top, authors->nr - 1, |
328 | "Others (%d)", "left", "", "sum", period); |
339 | "Others (%d)", "left", "", "sum", period); |
329 | |
340 | |
330 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", |
341 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", |
331 | "total", "sum", "sum", period); |
342 | "total", "sum", "sum", period); |
332 | html("</table>"); |
343 | html("</table>"); |
333 | } |
344 | } |
334 | |
345 | |
335 | /* Create a sorted string_list with one entry per author. The util-field |
346 | /* Create a sorted string_list with one entry per author. The util-field |
336 | * for each author is another string_list which is used to calculate the |
347 | * for each author is another string_list which is used to calculate the |
337 | * number of commits per time-interval. |
348 | * number of commits per time-interval. |
338 | */ |
349 | */ |
339 | void cgit_show_stats(struct cgit_context *ctx) |
350 | void cgit_show_stats(struct cgit_context *ctx) |
340 | { |
351 | { |
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 | } |
353 | authors = collect_stats(ctx, period); |
370 | authors = collect_stats(ctx, period); |
354 | qsort(authors.items, authors.nr, sizeof(struct string_list_item), |
371 | qsort(authors.items, authors.nr, sizeof(struct string_list_item), |
355 | cmp_total_commits); |
372 | cmp_total_commits); |
356 | |
373 | |
357 | top = ctx->qry.ofs; |
374 | top = ctx->qry.ofs; |
358 | if (!top) |
375 | if (!top) |
359 | top = 10; |
376 | top = 10; |
360 | htmlf("<h2>Commits per author per %s", period->name); |
377 | htmlf("<h2>Commits per author per %s", period->name); |
361 | if (ctx->qry.path) { |
378 | if (ctx->qry.path) { |
362 | html(" (path '"); |
379 | html(" (path '"); |
363 | html_txt(ctx->qry.path); |
380 | html_txt(ctx->qry.path); |
364 | html("')"); |
381 | html("')"); |
365 | } |
382 | } |
366 | html("</h2>"); |
383 | html("</h2>"); |
367 | |
384 | |
368 | html("<form method='get' action='.' style='float: right; text-align: right;'>"); |
385 | html("<form method='get' action='.' style='float: right; text-align: right;'>"); |
369 | if (strcmp(ctx->qry.head, ctx->repo->defbranch)) |
386 | if (strcmp(ctx->qry.head, ctx->repo->defbranch)) |
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: "); |
380 | html(""); |
399 | html(""); |
381 | html("<select name='ofs' onchange='this.form.submit();'>"); |
400 | html("<select name='ofs' onchange='this.form.submit();'>"); |
382 | htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : ""); |
401 | htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : ""); |
383 | htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : ""); |
402 | htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : ""); |
384 | htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : ""); |
403 | htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : ""); |
385 | htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : ""); |
404 | htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : ""); |
386 | htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : ""); |
405 | htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : ""); |
387 | html("</select>"); |
406 | html("</select>"); |
388 | html("<noscript> <input type='submit' value='Reload'/></noscript>"); |
407 | html("<noscript> <input type='submit' value='Reload'/></noscript>"); |
389 | html("</form>"); |
408 | html("</form>"); |
390 | print_authors(&authors, top, period); |
409 | print_authors(&authors, top, period); |
391 | } |
410 | } |
392 | |
411 | |
|