summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-stats.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/ui-stats.c b/ui-stats.c
index 9150840..3cc8d70 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -102,279 +102,291 @@ static void dec_quarter(struct tm *tm)
102 dec_month(tm); 102 dec_month(tm);
103 dec_month(tm); 103 dec_month(tm);
104 dec_month(tm); 104 dec_month(tm);
105} 105}
106 106
107static void inc_quarter(struct tm *tm) 107static void inc_quarter(struct tm *tm)
108{ 108{
109 inc_month(tm); 109 inc_month(tm);
110 inc_month(tm); 110 inc_month(tm);
111 inc_month(tm); 111 inc_month(tm);
112} 112}
113 113
114static char *pretty_quarter(struct tm *tm) 114static char *pretty_quarter(struct tm *tm)
115{ 115{
116 return fmt("Q%d %d", tm->tm_mon / 3 + 1, tm->tm_year + 1900); 116 return fmt("Q%d %d", tm->tm_mon / 3 + 1, tm->tm_year + 1900);
117} 117}
118 118
119static void trunc_year(struct tm *tm) 119static void trunc_year(struct tm *tm)
120{ 120{
121 trunc_month(tm); 121 trunc_month(tm);
122 tm->tm_mon = 0; 122 tm->tm_mon = 0;
123} 123}
124 124
125static void dec_year(struct tm *tm) 125static void dec_year(struct tm *tm)
126{ 126{
127 tm->tm_year--; 127 tm->tm_year--;
128} 128}
129 129
130static void inc_year(struct tm *tm) 130static void inc_year(struct tm *tm)
131{ 131{
132 tm->tm_year++; 132 tm->tm_year++;
133} 133}
134 134
135static char *pretty_year(struct tm *tm) 135static char *pretty_year(struct tm *tm)
136{ 136{
137 return fmt("%d", tm->tm_year + 1900); 137 return fmt("%d", tm->tm_year + 1900);
138} 138}
139 139
140struct Period periods[] = { 140struct Period periods[] = {
141 {'w', "week", 12, 4, trunc_week, dec_week, inc_week, pretty_week}, 141 {'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}, 142 {'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}, 143 {'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}, 144 {'y', "year", 12, 4, trunc_year, dec_year, inc_year, pretty_year},
145}; 145};
146 146
147static void add_commit(struct string_list *authors, struct commit *commit, 147static void add_commit(struct string_list *authors, struct commit *commit,
148 struct Period *period) 148 struct Period *period)
149{ 149{
150 struct commitinfo *info; 150 struct commitinfo *info;
151 struct string_list_item *author, *item; 151 struct string_list_item *author, *item;
152 struct authorstat *authorstat; 152 struct authorstat *authorstat;
153 struct string_list *items; 153 struct string_list *items;
154 char *tmp; 154 char *tmp;
155 struct tm *date; 155 struct tm *date;
156 time_t t; 156 time_t t;
157 157
158 info = cgit_parse_commit(commit); 158 info = cgit_parse_commit(commit);
159 tmp = xstrdup(info->author); 159 tmp = xstrdup(info->author);
160 author = string_list_insert(tmp, authors); 160 author = string_list_insert(tmp, authors);
161 if (!author->util) 161 if (!author->util)
162 author->util = xcalloc(1, sizeof(struct authorstat)); 162 author->util = xcalloc(1, sizeof(struct authorstat));
163 else 163 else
164 free(tmp); 164 free(tmp);
165 authorstat = author->util; 165 authorstat = author->util;
166 items = &authorstat->list; 166 items = &authorstat->list;
167 t = info->committer_date; 167 t = info->committer_date;
168 date = gmtime(&t); 168 date = gmtime(&t);
169 period->trunc(date); 169 period->trunc(date);
170 tmp = xstrdup(period->pretty(date)); 170 tmp = xstrdup(period->pretty(date));
171 item = string_list_insert(tmp, items); 171 item = string_list_insert(tmp, items);
172 if (item->util) 172 if (item->util)
173 free(tmp); 173 free(tmp);
174 item->util++; 174 item->util++;
175 authorstat->total++; 175 authorstat->total++;
176 cgit_free_commitinfo(info); 176 cgit_free_commitinfo(info);
177} 177}
178 178
179static int cmp_total_commits(const void *a1, const void *a2) 179static int cmp_total_commits(const void *a1, const void *a2)
180{ 180{
181 const struct string_list_item *i1 = a1; 181 const struct string_list_item *i1 = a1;
182 const struct string_list_item *i2 = a2; 182 const struct string_list_item *i2 = a2;
183 const struct authorstat *auth1 = i1->util; 183 const struct authorstat *auth1 = i1->util;
184 const struct authorstat *auth2 = i2->util; 184 const struct authorstat *auth2 = i2->util;
185 185
186 return auth2->total - auth1->total; 186 return auth2->total - auth1->total;
187} 187}
188 188
189/* Walk the commit DAG and collect number of commits per author per 189/* Walk the commit DAG and collect number of commits per author per
190 * timeperiod into a nested string_list collection. 190 * timeperiod into a nested string_list collection.
191 */ 191 */
192struct string_list collect_stats(struct cgit_context *ctx, 192struct string_list collect_stats(struct cgit_context *ctx,
193 struct Period *period) 193 struct Period *period)
194{ 194{
195 struct string_list authors; 195 struct string_list authors;
196 struct rev_info rev; 196 struct rev_info rev;
197 struct commit *commit; 197 struct commit *commit;
198 const char *argv[] = {NULL, ctx->qry.head, NULL, NULL}; 198 const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL};
199 int argc = 3;
199 time_t now; 200 time_t now;
200 long i; 201 long i;
201 struct tm *tm; 202 struct tm *tm;
202 char tmp[11]; 203 char tmp[11];
203 204
204 time(&now); 205 time(&now);
205 tm = gmtime(&now); 206 tm = gmtime(&now);
206 period->trunc(tm); 207 period->trunc(tm);
207 for (i = 1; i < period->count; i++) 208 for (i = 1; i < period->count; i++)
208 period->dec(tm); 209 period->dec(tm);
209 strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm); 210 strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
210 argv[2] = xstrdup(fmt("--since=%s", tmp)); 211 argv[2] = xstrdup(fmt("--since=%s", tmp));
212 if (ctx->qry.path) {
213 argv[3] = "--";
214 argv[4] = ctx->qry.path;
215 argc += 2;
216 }
211 init_revisions(&rev, NULL); 217 init_revisions(&rev, NULL);
212 rev.abbrev = DEFAULT_ABBREV; 218 rev.abbrev = DEFAULT_ABBREV;
213 rev.commit_format = CMIT_FMT_DEFAULT; 219 rev.commit_format = CMIT_FMT_DEFAULT;
214 rev.no_merges = 1; 220 rev.no_merges = 1;
215 rev.verbose_header = 1; 221 rev.verbose_header = 1;
216 rev.show_root_diff = 0; 222 rev.show_root_diff = 0;
217 setup_revisions(3, argv, &rev, NULL); 223 setup_revisions(argc, argv, &rev, NULL);
218 prepare_revision_walk(&rev); 224 prepare_revision_walk(&rev);
219 memset(&authors, 0, sizeof(authors)); 225 memset(&authors, 0, sizeof(authors));
220 while ((commit = get_revision(&rev)) != NULL) { 226 while ((commit = get_revision(&rev)) != NULL) {
221 add_commit(&authors, commit, period); 227 add_commit(&authors, commit, period);
222 free(commit->buffer); 228 free(commit->buffer);
223 free_commit_list(commit->parents); 229 free_commit_list(commit->parents);
224 } 230 }
225 return authors; 231 return authors;
226} 232}
227 233
228void print_combined_authorrow(struct string_list *authors, int from, int to, 234void print_combined_authorrow(struct string_list *authors, int from, int to,
229 const char *name, const char *leftclass, const char *centerclass, 235 const char *name, const char *leftclass, const char *centerclass,
230 const char *rightclass, struct Period *period) 236 const char *rightclass, struct Period *period)
231{ 237{
232 struct string_list_item *author; 238 struct string_list_item *author;
233 struct authorstat *authorstat; 239 struct authorstat *authorstat;
234 struct string_list *items; 240 struct string_list *items;
235 struct string_list_item *date; 241 struct string_list_item *date;
236 time_t now; 242 time_t now;
237 long i, j, total, subtotal; 243 long i, j, total, subtotal;
238 struct tm *tm; 244 struct tm *tm;
239 char *tmp; 245 char *tmp;
240 246
241 time(&now); 247 time(&now);
242 tm = gmtime(&now); 248 tm = gmtime(&now);
243 period->trunc(tm); 249 period->trunc(tm);
244 for (i = 1; i < period->count; i++) 250 for (i = 1; i < period->count; i++)
245 period->dec(tm); 251 period->dec(tm);
246 252
247 total = 0; 253 total = 0;
248 htmlf("<tr><td class='%s'>%s</td>", leftclass, 254 htmlf("<tr><td class='%s'>%s</td>", leftclass,
249 fmt(name, to - from + 1)); 255 fmt(name, to - from + 1));
250 for (j = 0; j < period->count; j++) { 256 for (j = 0; j < period->count; j++) {
251 tmp = period->pretty(tm); 257 tmp = period->pretty(tm);
252 period->inc(tm); 258 period->inc(tm);
253 subtotal = 0; 259 subtotal = 0;
254 for (i = from; i <= to; i++) { 260 for (i = from; i <= to; i++) {
255 author = &authors->items[i]; 261 author = &authors->items[i];
256 authorstat = author->util; 262 authorstat = author->util;
257 items = &authorstat->list; 263 items = &authorstat->list;
258 date = string_list_lookup(tmp, items); 264 date = string_list_lookup(tmp, items);
259 if (date) 265 if (date)
260 subtotal += (size_t)date->util; 266 subtotal += (size_t)date->util;
261 } 267 }
262 htmlf("<td class='%s'>%d</td>", centerclass, subtotal); 268 htmlf("<td class='%s'>%d</td>", centerclass, subtotal);
263 total += subtotal; 269 total += subtotal;
264 } 270 }
265 htmlf("<td class='%s'>%d</td></tr>", rightclass, total); 271 htmlf("<td class='%s'>%d</td></tr>", rightclass, total);
266} 272}
267 273
268void print_authors(struct string_list *authors, int top, struct Period *period) 274void print_authors(struct string_list *authors, int top, struct Period *period)
269{ 275{
270 struct string_list_item *author; 276 struct string_list_item *author;
271 struct authorstat *authorstat; 277 struct authorstat *authorstat;
272 struct string_list *items; 278 struct string_list *items;
273 struct string_list_item *date; 279 struct string_list_item *date;
274 time_t now; 280 time_t now;
275 long i, j, total; 281 long i, j, total;
276 struct tm *tm; 282 struct tm *tm;
277 char *tmp; 283 char *tmp;
278 284
279 time(&now); 285 time(&now);
280 tm = gmtime(&now); 286 tm = gmtime(&now);
281 period->trunc(tm); 287 period->trunc(tm);
282 for (i = 1; i < period->count; i++) 288 for (i = 1; i < period->count; i++)
283 period->dec(tm); 289 period->dec(tm);
284 290
285 html("<table class='stats'><tr><th>Author</th>"); 291 html("<table class='stats'><tr><th>Author</th>");
286 for (j = 0; j < period->count; j++) { 292 for (j = 0; j < period->count; j++) {
287 tmp = period->pretty(tm); 293 tmp = period->pretty(tm);
288 htmlf("<th>%s</th>", tmp); 294 htmlf("<th>%s</th>", tmp);
289 period->inc(tm); 295 period->inc(tm);
290 } 296 }
291 html("<th>Total</th></tr>\n"); 297 html("<th>Total</th></tr>\n");
292 298
293 if (top <= 0 || top > authors->nr) 299 if (top <= 0 || top > authors->nr)
294 top = authors->nr; 300 top = authors->nr;
295 301
296 for (i = 0; i < top; i++) { 302 for (i = 0; i < top; i++) {
297 author = &authors->items[i]; 303 author = &authors->items[i];
298 html("<tr><td class='left'>"); 304 html("<tr><td class='left'>");
299 html_txt(author->string); 305 html_txt(author->string);
300 html("</td>"); 306 html("</td>");
301 authorstat = author->util; 307 authorstat = author->util;
302 items = &authorstat->list; 308 items = &authorstat->list;
303 total = 0; 309 total = 0;
304 for (j = 0; j < period->count; j++) 310 for (j = 0; j < period->count; j++)
305 period->dec(tm); 311 period->dec(tm);
306 for (j = 0; j < period->count; j++) { 312 for (j = 0; j < period->count; j++) {
307 tmp = period->pretty(tm); 313 tmp = period->pretty(tm);
308 period->inc(tm); 314 period->inc(tm);
309 date = string_list_lookup(tmp, items); 315 date = string_list_lookup(tmp, items);
310 if (!date) 316 if (!date)
311 html("<td>0</td>"); 317 html("<td>0</td>");
312 else { 318 else {
313 htmlf("<td>%d</td>", date->util); 319 htmlf("<td>%d</td>", date->util);
314 total += (size_t)date->util; 320 total += (size_t)date->util;
315 } 321 }
316 } 322 }
317 htmlf("<td class='sum'>%d</td></tr>", total); 323 htmlf("<td class='sum'>%d</td></tr>", total);
318 } 324 }
319 325
320 if (top < authors->nr) 326 if (top < authors->nr)
321 print_combined_authorrow(authors, top, authors->nr - 1, 327 print_combined_authorrow(authors, top, authors->nr - 1,
322 "Others (%d)", "left", "", "sum", period); 328 "Others (%d)", "left", "", "sum", period);
323 329
324 print_combined_authorrow(authors, 0, authors->nr - 1, "Total", 330 print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
325 "total", "sum", "sum", period); 331 "total", "sum", "sum", period);
326 html("</table>"); 332 html("</table>");
327} 333}
328 334
329/* Create a sorted string_list with one entry per author. The util-field 335/* Create a sorted string_list with one entry per author. The util-field
330 * for each author is another string_list which is used to calculate the 336 * for each author is another string_list which is used to calculate the
331 * number of commits per time-interval. 337 * number of commits per time-interval.
332 */ 338 */
333void cgit_show_stats(struct cgit_context *ctx) 339void cgit_show_stats(struct cgit_context *ctx)
334{ 340{
335 struct string_list authors; 341 struct string_list authors;
336 struct Period *period; 342 struct Period *period;
337 int top, i; 343 int top, i;
338 344
339 period = &periods[0]; 345 period = &periods[0];
340 if (ctx->qry.period) { 346 if (ctx->qry.period) {
341 for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) 347 for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++)
342 if (periods[i].code == ctx->qry.period[0]) { 348 if (periods[i].code == ctx->qry.period[0]) {
343 period = &periods[i]; 349 period = &periods[i];
344 break; 350 break;
345 } 351 }
346 } 352 }
347 authors = collect_stats(ctx, period); 353 authors = collect_stats(ctx, period);
348 qsort(authors.items, authors.nr, sizeof(struct string_list_item), 354 qsort(authors.items, authors.nr, sizeof(struct string_list_item),
349 cmp_total_commits); 355 cmp_total_commits);
350 356
351 top = ctx->qry.ofs; 357 top = ctx->qry.ofs;
352 if (!top) 358 if (!top)
353 top = 10; 359 top = 10;
354 htmlf("<h2>Commits per author per %s</h2>", period->name); 360 htmlf("<h2>Commits per author per %s", period->name);
361 if (ctx->qry.path) {
362 html(" (path '");
363 html_txt(ctx->qry.path);
364 html("')");
365 }
366 html("</h2>");
355 367
356 html("<form method='get' action='.' style='float: right; text-align: right;'>"); 368 html("<form method='get' action='.' style='float: right; text-align: right;'>");
357 if (strcmp(ctx->qry.head, ctx->repo->defbranch)) 369 if (strcmp(ctx->qry.head, ctx->repo->defbranch))
358 htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head); 370 htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head);
359 html("Period: "); 371 html("Period: ");
360 html("<select name='period' onchange='this.form.submit();'>"); 372 html("<select name='period' onchange='this.form.submit();'>");
361 for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) 373 for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++)
362 htmlf("<option value='%c'%s>%s</option>", 374 htmlf("<option value='%c'%s>%s</option>",
363 periods[i].code, 375 periods[i].code,
364 period == &periods[i] ? " selected" : "", 376 period == &periods[i] ? " selected" : "",
365 periods[i].name); 377 periods[i].name);
366 html("</select><br/><br/>"); 378 html("</select><br/><br/>");
367 html("Authors: "); 379 html("Authors: ");
368 html(""); 380 html("");
369 html("<select name='ofs' onchange='this.form.submit();'>"); 381 html("<select name='ofs' onchange='this.form.submit();'>");
370 htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : ""); 382 htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : "");
371 htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : ""); 383 htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : "");
372 htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : ""); 384 htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : "");
373 htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : ""); 385 htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : "");
374 htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : ""); 386 htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : "");
375 html("</select>"); 387 html("</select>");
376 html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>"); 388 html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>");
377 html("</form>"); 389 html("</form>");
378 print_authors(&authors, top, period); 390 print_authors(&authors, top, period);
379} 391}
380 392