author | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 09:02:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 09:02:48 (UTC) |
commit | b47b7bd1d0fb872763214e674b53a562c7513fc0 (patch) (unidiff) | |
tree | 03466abfe90a858ee4f7b09877b095b6a7f50555 /ui-stats.c | |
parent | 5ca8df0a3d75ba1ca5af28872977f7714b66ff37 (diff) | |
download | cgit-b47b7bd1d0fb872763214e674b53a562c7513fc0.zip cgit-b47b7bd1d0fb872763214e674b53a562c7513fc0.tar.gz cgit-b47b7bd1d0fb872763214e674b53a562c7513fc0.tar.bz2 |
Add and use cgit_find_stats_periodname() in print_repo()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-stats.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -93,128 +93,136 @@ static void dec_quarter(struct tm *tm) | |||
93 | static void inc_quarter(struct tm *tm) | 93 | static void inc_quarter(struct tm *tm) |
94 | { | 94 | { |
95 | inc_month(tm); | 95 | inc_month(tm); |
96 | inc_month(tm); | 96 | inc_month(tm); |
97 | inc_month(tm); | 97 | inc_month(tm); |
98 | } | 98 | } |
99 | 99 | ||
100 | static char *pretty_quarter(struct tm *tm) | 100 | static char *pretty_quarter(struct tm *tm) |
101 | { | 101 | { |
102 | return fmt("Q%d %d", tm->tm_mon / 3 + 1, tm->tm_year + 1900); | 102 | return fmt("Q%d %d", tm->tm_mon / 3 + 1, tm->tm_year + 1900); |
103 | } | 103 | } |
104 | 104 | ||
105 | static void trunc_year(struct tm *tm) | 105 | static void trunc_year(struct tm *tm) |
106 | { | 106 | { |
107 | trunc_month(tm); | 107 | trunc_month(tm); |
108 | tm->tm_mon = 0; | 108 | tm->tm_mon = 0; |
109 | } | 109 | } |
110 | 110 | ||
111 | static void dec_year(struct tm *tm) | 111 | static void dec_year(struct tm *tm) |
112 | { | 112 | { |
113 | tm->tm_year--; | 113 | tm->tm_year--; |
114 | } | 114 | } |
115 | 115 | ||
116 | static void inc_year(struct tm *tm) | 116 | static void inc_year(struct tm *tm) |
117 | { | 117 | { |
118 | tm->tm_year++; | 118 | tm->tm_year++; |
119 | } | 119 | } |
120 | 120 | ||
121 | static char *pretty_year(struct tm *tm) | 121 | static char *pretty_year(struct tm *tm) |
122 | { | 122 | { |
123 | return fmt("%d", tm->tm_year + 1900); | 123 | return fmt("%d", tm->tm_year + 1900); |
124 | } | 124 | } |
125 | 125 | ||
126 | struct cgit_period periods[] = { | 126 | struct cgit_period periods[] = { |
127 | {'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}, |
128 | {'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}, |
129 | {'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}, |
130 | {'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}, |
131 | }; | 131 | }; |
132 | 132 | ||
133 | /* Given a period code or name, return a period index (1, 2, 3 or 4) | 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. | 134 | * and update the period pointer to the correcsponding struct. |
135 | * If no matching code is found, return 0. | 135 | * If no matching code is found, return 0. |
136 | */ | 136 | */ |
137 | int cgit_find_stats_period(const char *expr, struct cgit_period **period) | 137 | int cgit_find_stats_period(const char *expr, struct cgit_period **period) |
138 | { | 138 | { |
139 | int i; | 139 | int i; |
140 | char code = '\0'; | 140 | char code = '\0'; |
141 | 141 | ||
142 | if (!expr) | 142 | if (!expr) |
143 | return 0; | 143 | return 0; |
144 | 144 | ||
145 | if (strlen(expr) == 1) | 145 | if (strlen(expr) == 1) |
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) | ||
158 | { | ||
159 | if (idx > 0 && idx < 4) | ||
160 | return periods[idx - 1].name; | ||
161 | else | ||
162 | return ""; | ||
163 | } | ||
164 | |||
157 | static void add_commit(struct string_list *authors, struct commit *commit, | 165 | static void add_commit(struct string_list *authors, struct commit *commit, |
158 | struct cgit_period *period) | 166 | struct cgit_period *period) |
159 | { | 167 | { |
160 | struct commitinfo *info; | 168 | struct commitinfo *info; |
161 | struct string_list_item *author, *item; | 169 | struct string_list_item *author, *item; |
162 | struct authorstat *authorstat; | 170 | struct authorstat *authorstat; |
163 | struct string_list *items; | 171 | struct string_list *items; |
164 | char *tmp; | 172 | char *tmp; |
165 | struct tm *date; | 173 | struct tm *date; |
166 | time_t t; | 174 | time_t t; |
167 | 175 | ||
168 | info = cgit_parse_commit(commit); | 176 | info = cgit_parse_commit(commit); |
169 | tmp = xstrdup(info->author); | 177 | tmp = xstrdup(info->author); |
170 | author = string_list_insert(tmp, authors); | 178 | author = string_list_insert(tmp, authors); |
171 | if (!author->util) | 179 | if (!author->util) |
172 | author->util = xcalloc(1, sizeof(struct authorstat)); | 180 | author->util = xcalloc(1, sizeof(struct authorstat)); |
173 | else | 181 | else |
174 | free(tmp); | 182 | free(tmp); |
175 | authorstat = author->util; | 183 | authorstat = author->util; |
176 | items = &authorstat->list; | 184 | items = &authorstat->list; |
177 | t = info->committer_date; | 185 | t = info->committer_date; |
178 | date = gmtime(&t); | 186 | date = gmtime(&t); |
179 | period->trunc(date); | 187 | period->trunc(date); |
180 | tmp = xstrdup(period->pretty(date)); | 188 | tmp = xstrdup(period->pretty(date)); |
181 | item = string_list_insert(tmp, items); | 189 | item = string_list_insert(tmp, items); |
182 | if (item->util) | 190 | if (item->util) |
183 | free(tmp); | 191 | free(tmp); |
184 | item->util++; | 192 | item->util++; |
185 | authorstat->total++; | 193 | authorstat->total++; |
186 | cgit_free_commitinfo(info); | 194 | cgit_free_commitinfo(info); |
187 | } | 195 | } |
188 | 196 | ||
189 | static int cmp_total_commits(const void *a1, const void *a2) | 197 | static int cmp_total_commits(const void *a1, const void *a2) |
190 | { | 198 | { |
191 | const struct string_list_item *i1 = a1; | 199 | const struct string_list_item *i1 = a1; |
192 | const struct string_list_item *i2 = a2; | 200 | const struct string_list_item *i2 = a2; |
193 | const struct authorstat *auth1 = i1->util; | 201 | const struct authorstat *auth1 = i1->util; |
194 | const struct authorstat *auth2 = i2->util; | 202 | const struct authorstat *auth2 = i2->util; |
195 | 203 | ||
196 | return auth2->total - auth1->total; | 204 | return auth2->total - auth1->total; |
197 | } | 205 | } |
198 | 206 | ||
199 | /* 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 |
200 | * timeperiod into a nested string_list collection. | 208 | * timeperiod into a nested string_list collection. |
201 | */ | 209 | */ |
202 | struct string_list collect_stats(struct cgit_context *ctx, | 210 | struct string_list collect_stats(struct cgit_context *ctx, |
203 | struct cgit_period *period) | 211 | struct cgit_period *period) |
204 | { | 212 | { |
205 | struct string_list authors; | 213 | struct string_list authors; |
206 | struct rev_info rev; | 214 | struct rev_info rev; |
207 | struct commit *commit; | 215 | struct commit *commit; |
208 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; | 216 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; |
209 | int argc = 3; | 217 | int argc = 3; |
210 | time_t now; | 218 | time_t now; |
211 | long i; | 219 | long i; |
212 | struct tm *tm; | 220 | struct tm *tm; |
213 | char tmp[11]; | 221 | char tmp[11]; |
214 | 222 | ||
215 | time(&now); | 223 | time(&now); |
216 | tm = gmtime(&now); | 224 | tm = gmtime(&now); |
217 | period->trunc(tm); | 225 | period->trunc(tm); |
218 | for (i = 1; i < period->count; i++) | 226 | for (i = 1; i < period->count; i++) |
219 | period->dec(tm); | 227 | period->dec(tm); |
220 | strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm); | 228 | strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm); |