-rw-r--r-- | ui-repolist.c | 137 |
1 files changed, 122 insertions, 15 deletions
diff --git a/ui-repolist.c b/ui-repolist.c index 2324273..2c13d50 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -31,23 +31,40 @@ time_t read_agefile(char *path) | |||
31 | else | 31 | else |
32 | return 0; | 32 | return 0; |
33 | } | 33 | } |
34 | 34 | ||
35 | static void print_modtime(struct cgit_repo *repo) | 35 | static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) |
36 | { | 36 | { |
37 | char *path; | 37 | char *path; |
38 | struct stat s; | 38 | struct stat s; |
39 | struct cgit_repo *r = (struct cgit_repo *)repo; | ||
39 | 40 | ||
41 | if (repo->mtime != -1) { | ||
42 | *mtime = repo->mtime; | ||
43 | return 1; | ||
44 | } | ||
40 | path = fmt("%s/%s", repo->path, ctx.cfg.agefile); | 45 | path = fmt("%s/%s", repo->path, ctx.cfg.agefile); |
41 | if (stat(path, &s) == 0) { | 46 | if (stat(path, &s) == 0) { |
42 | cgit_print_age(read_agefile(path), -1, NULL); | 47 | *mtime = read_agefile(path); |
43 | return; | 48 | r->mtime = *mtime; |
49 | return 1; | ||
44 | } | 50 | } |
45 | 51 | ||
46 | path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); | 52 | path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); |
47 | if (stat(path, &s) != 0) | 53 | if (stat(path, &s) == 0) |
48 | return; | 54 | *mtime = s.st_mtime; |
49 | cgit_print_age(s.st_mtime, -1, NULL); | 55 | else |
56 | *mtime = 0; | ||
57 | |||
58 | r->mtime = *mtime; | ||
59 | return (r->mtime != 0); | ||
60 | } | ||
61 | |||
62 | static void print_modtime(struct cgit_repo *repo) | ||
63 | { | ||
64 | time_t t; | ||
65 | if (get_repo_modtime(repo, &t)) | ||
66 | cgit_print_age(t, -1, NULL); | ||
50 | } | 67 | } |
51 | 68 | ||
52 | int is_match(struct cgit_repo *repo) | 69 | int is_match(struct cgit_repo *repo) |
53 | { | 70 | { |
@@ -72,15 +89,25 @@ int is_in_url(struct cgit_repo *repo) | |||
72 | return 1; | 89 | return 1; |
73 | return 0; | 90 | return 0; |
74 | } | 91 | } |
75 | 92 | ||
93 | void print_sort_header(const char *title, const char *sort) | ||
94 | { | ||
95 | htmlf("<th class='left'><a href='./?s=%s", sort); | ||
96 | if (ctx.qry.search) { | ||
97 | html("&q="); | ||
98 | html_url_arg(ctx.qry.search); | ||
99 | } | ||
100 | htmlf("'>%s</a></th>", title); | ||
101 | } | ||
102 | |||
76 | void print_header(int columns) | 103 | void print_header(int columns) |
77 | { | 104 | { |
78 | html("<tr class='nohover'>" | 105 | html("<tr class='nohover'>"); |
79 | "<th class='left'>Name</th>" | 106 | print_sort_header("Name", "name"); |
80 | "<th class='left'>Description</th>" | 107 | print_sort_header("Description", "desc"); |
81 | "<th class='left'>Owner</th>" | 108 | print_sort_header("Owner", "owner"); |
82 | "<th class='left'>Idle</th>"); | 109 | print_sort_header("Idle", "idle"); |
83 | if (ctx.cfg.enable_index_links) | 110 | if (ctx.cfg.enable_index_links) |
84 | html("<th class='left'>Links</th>"); | 111 | html("<th class='left'>Links</th>"); |
85 | html("</tr>\n"); | 112 | html("</tr>\n"); |
86 | } | 113 | } |
@@ -95,12 +122,88 @@ void print_pager(int items, int pagelen, char *search) | |||
95 | search, i * pagelen); | 122 | search, i * pagelen); |
96 | html("</div>"); | 123 | html("</div>"); |
97 | } | 124 | } |
98 | 125 | ||
126 | static int cmp(const char *s1, const char *s2) | ||
127 | { | ||
128 | if (s1 && s2) | ||
129 | return strcmp(s1, s2); | ||
130 | if (s1 && !s2) | ||
131 | return -1; | ||
132 | if (s2 && !s1) | ||
133 | return 1; | ||
134 | return 0; | ||
135 | } | ||
136 | |||
137 | static int sort_name(const void *a, const void *b) | ||
138 | { | ||
139 | const struct cgit_repo *r1 = a; | ||
140 | const struct cgit_repo *r2 = b; | ||
141 | |||
142 | return cmp(r1->name, r2->name); | ||
143 | } | ||
144 | |||
145 | static int sort_desc(const void *a, const void *b) | ||
146 | { | ||
147 | const struct cgit_repo *r1 = a; | ||
148 | const struct cgit_repo *r2 = b; | ||
149 | |||
150 | return cmp(r1->desc, r2->desc); | ||
151 | } | ||
152 | |||
153 | static int sort_owner(const void *a, const void *b) | ||
154 | { | ||
155 | const struct cgit_repo *r1 = a; | ||
156 | const struct cgit_repo *r2 = b; | ||
157 | |||
158 | return cmp(r1->owner, r2->owner); | ||
159 | } | ||
160 | |||
161 | static int sort_idle(const void *a, const void *b) | ||
162 | { | ||
163 | const struct cgit_repo *r1 = a; | ||
164 | const struct cgit_repo *r2 = b; | ||
165 | time_t t1, t2; | ||
166 | |||
167 | t1 = t2 = 0; | ||
168 | get_repo_modtime(r1, &t1); | ||
169 | get_repo_modtime(r2, &t2); | ||
170 | return t2 - t1; | ||
171 | } | ||
172 | |||
173 | struct sortcolumn { | ||
174 | const char *name; | ||
175 | int (*fn)(const void *a, const void *b); | ||
176 | }; | ||
177 | |||
178 | struct sortcolumn sortcolumn[] = { | ||
179 | {"name", sort_name}, | ||
180 | {"desc", sort_desc}, | ||
181 | {"owner", sort_owner}, | ||
182 | {"idle", sort_idle}, | ||
183 | {NULL, NULL} | ||
184 | }; | ||
185 | |||
186 | int sort_repolist(char *field) | ||
187 | { | ||
188 | struct sortcolumn *column; | ||
189 | |||
190 | for (column = &sortcolumn[0]; column->name; column++) { | ||
191 | if (strcmp(field, column->name)) | ||
192 | continue; | ||
193 | qsort(cgit_repolist.repos, cgit_repolist.count, | ||
194 | sizeof(struct cgit_repo), column->fn); | ||
195 | return 1; | ||
196 | } | ||
197 | return 0; | ||
198 | } | ||
199 | |||
200 | |||
99 | void cgit_print_repolist() | 201 | void cgit_print_repolist() |
100 | { | 202 | { |
101 | int i, columns = 4, hits = 0, header = 0; | 203 | int i, columns = 4, hits = 0, header = 0; |
102 | char *last_group = NULL; | 204 | char *last_group = NULL; |
205 | int sorted = 0; | ||
103 | 206 | ||
104 | if (ctx.cfg.enable_index_links) | 207 | if (ctx.cfg.enable_index_links) |
105 | columns++; | 208 | columns++; |
106 | 209 | ||
@@ -111,8 +214,11 @@ void cgit_print_repolist() | |||
111 | 214 | ||
112 | if (ctx.cfg.index_header) | 215 | if (ctx.cfg.index_header) |
113 | html_include(ctx.cfg.index_header); | 216 | html_include(ctx.cfg.index_header); |
114 | 217 | ||
218 | if(ctx.qry.sort) | ||
219 | sorted = sort_repolist(ctx.qry.sort); | ||
220 | |||
115 | html("<table summary='repository list' class='list nowrap'>"); | 221 | html("<table summary='repository list' class='list nowrap'>"); |
116 | for (i=0; i<cgit_repolist.count; i++) { | 222 | for (i=0; i<cgit_repolist.count; i++) { |
117 | ctx.repo = &cgit_repolist.repos[i]; | 223 | ctx.repo = &cgit_repolist.repos[i]; |
118 | if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) | 224 | if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) |
@@ -123,20 +229,21 @@ void cgit_print_repolist() | |||
123 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) | 229 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) |
124 | continue; | 230 | continue; |
125 | if (!header++) | 231 | if (!header++) |
126 | print_header(columns); | 232 | print_header(columns); |
127 | if ((last_group == NULL && ctx.repo->group != NULL) || | 233 | if (!sorted && |
234 | ((last_group == NULL && ctx.repo->group != NULL) || | ||
128 | (last_group != NULL && ctx.repo->group == NULL) || | 235 | (last_group != NULL && ctx.repo->group == NULL) || |
129 | (last_group != NULL && ctx.repo->group != NULL && | 236 | (last_group != NULL && ctx.repo->group != NULL && |
130 | strcmp(ctx.repo->group, last_group))) { | 237 | strcmp(ctx.repo->group, last_group)))) { |
131 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", | 238 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", |
132 | columns); | 239 | columns); |
133 | html_txt(ctx.repo->group); | 240 | html_txt(ctx.repo->group); |
134 | html("</td></tr>"); | 241 | html("</td></tr>"); |
135 | last_group = ctx.repo->group; | 242 | last_group = ctx.repo->group; |
136 | } | 243 | } |
137 | htmlf("<tr><td class='%s'>", | 244 | htmlf("<tr><td class='%s'>", |
138 | ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); | 245 | !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); |
139 | cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); | 246 | cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); |
140 | html("</td><td>"); | 247 | html("</td><td>"); |
141 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); | 248 | html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); |
142 | html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); | 249 | html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); |
@@ -149,9 +256,9 @@ void cgit_print_repolist() | |||
149 | if (ctx.cfg.enable_index_links) { | 256 | if (ctx.cfg.enable_index_links) { |
150 | html("<td>"); | 257 | html("<td>"); |
151 | cgit_summary_link("summary", NULL, "button", NULL); | 258 | cgit_summary_link("summary", NULL, "button", NULL); |
152 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, | 259 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, |
153 | 0, NULL, NULL); | 260 | 0, NULL, NULL, ctx.qry.showmsg); |
154 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); | 261 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); |
155 | html("</td>"); | 262 | html("</td>"); |
156 | } | 263 | } |
157 | html("</tr>\n"); | 264 | html("</tr>\n"); |