author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:35:49 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:35:49 (UTC) |
commit | 9c8be943f72b6f1bda5a31ce401899c3dd734e98 (patch) (unidiff) | |
tree | 2279ad0a7d36563df7698d6d4e81967d67eb2562 | |
parent | e550440233875b298f8574e9273457516791010f (diff) | |
parent | 8813170390f3c3a0f4743afbc92ede42953fa3b0 (diff) | |
download | cgit-9c8be943f72b6f1bda5a31ce401899c3dd734e98.zip cgit-9c8be943f72b6f1bda5a31ce401899c3dd734e98.tar.gz cgit-9c8be943f72b6f1bda5a31ce401899c3dd734e98.tar.bz2 |
Merge branch 'lh/sort-repolist'
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-repolist.c | 135 |
4 files changed, 126 insertions, 14 deletions
@@ -156,2 +156,4 @@ static void querystring_cb(const char *name, const char *value) | |||
156 | ctx.qry.mimetype = xstrdup(value); | 156 | ctx.qry.mimetype = xstrdup(value); |
157 | } else if (!strcmp(name, "s")){ | ||
158 | ctx.qry.sort = xstrdup(value); | ||
157 | } | 159 | } |
@@ -63,2 +63,3 @@ struct cgit_repo { | |||
63 | int enable_log_linecount; | 63 | int enable_log_linecount; |
64 | time_t mtime; | ||
64 | }; | 65 | }; |
@@ -123,2 +124,3 @@ struct cgit_query { | |||
123 | int nohead; | 124 | int nohead; |
125 | char *sort; | ||
124 | }; | 126 | }; |
@@ -62,2 +62,3 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
62 | ret->readme = NULL; | 62 | ret->readme = NULL; |
63 | ret->mtime = -1; | ||
63 | return ret; | 64 | return ret; |
diff --git a/ui-repolist.c b/ui-repolist.c index 2324273..87196f0 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -34,3 +34,3 @@ time_t read_agefile(char *path) | |||
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 | { |
@@ -38,7 +38,13 @@ static void print_modtime(struct cgit_repo *repo) | |||
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 | } |
@@ -46,5 +52,16 @@ static void print_modtime(struct cgit_repo *repo) | |||
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 | } |
@@ -75,9 +92,19 @@ int is_in_url(struct cgit_repo *repo) | |||
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) |
@@ -98,2 +125,77 @@ void print_pager(int items, int pagelen, char *search) | |||
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() |
@@ -102,2 +204,3 @@ void cgit_print_repolist() | |||
102 | char *last_group = NULL; | 204 | char *last_group = NULL; |
205 | int sorted = 0; | ||
103 | 206 | ||
@@ -114,2 +217,5 @@ void cgit_print_repolist() | |||
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'>"); |
@@ -126,6 +232,7 @@ void cgit_print_repolist() | |||
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'>", |
@@ -137,3 +244,3 @@ void cgit_print_repolist() | |||
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); |