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
@@ -109,96 +109,98 @@ void config_cb(const char *name, const char *value) | |||
109 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 109 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
110 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 110 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
111 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 111 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
112 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 112 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
113 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 113 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
114 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 114 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
115 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 115 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
116 | ctx.repo->module_link= xstrdup(value); | 116 | ctx.repo->module_link= xstrdup(value); |
117 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 117 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
118 | if (*value == '/') | 118 | if (*value == '/') |
119 | ctx.repo->readme = xstrdup(value); | 119 | ctx.repo->readme = xstrdup(value); |
120 | else | 120 | else |
121 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 121 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
122 | } else if (!strcmp(name, "include")) | 122 | } else if (!strcmp(name, "include")) |
123 | parse_configfile(value, config_cb); | 123 | parse_configfile(value, config_cb); |
124 | } | 124 | } |
125 | 125 | ||
126 | static void querystring_cb(const char *name, const char *value) | 126 | static void querystring_cb(const char *name, const char *value) |
127 | { | 127 | { |
128 | if (!strcmp(name,"r")) { | 128 | if (!strcmp(name,"r")) { |
129 | ctx.qry.repo = xstrdup(value); | 129 | ctx.qry.repo = xstrdup(value); |
130 | ctx.repo = cgit_get_repoinfo(value); | 130 | ctx.repo = cgit_get_repoinfo(value); |
131 | } else if (!strcmp(name, "p")) { | 131 | } else if (!strcmp(name, "p")) { |
132 | ctx.qry.page = xstrdup(value); | 132 | ctx.qry.page = xstrdup(value); |
133 | } else if (!strcmp(name, "url")) { | 133 | } else if (!strcmp(name, "url")) { |
134 | ctx.qry.url = xstrdup(value); | 134 | ctx.qry.url = xstrdup(value); |
135 | cgit_parse_url(value); | 135 | cgit_parse_url(value); |
136 | } else if (!strcmp(name, "qt")) { | 136 | } else if (!strcmp(name, "qt")) { |
137 | ctx.qry.grep = xstrdup(value); | 137 | ctx.qry.grep = xstrdup(value); |
138 | } else if (!strcmp(name, "q")) { | 138 | } else if (!strcmp(name, "q")) { |
139 | ctx.qry.search = xstrdup(value); | 139 | ctx.qry.search = xstrdup(value); |
140 | } else if (!strcmp(name, "h")) { | 140 | } else if (!strcmp(name, "h")) { |
141 | ctx.qry.head = xstrdup(value); | 141 | ctx.qry.head = xstrdup(value); |
142 | ctx.qry.has_symref = 1; | 142 | ctx.qry.has_symref = 1; |
143 | } else if (!strcmp(name, "id")) { | 143 | } else if (!strcmp(name, "id")) { |
144 | ctx.qry.sha1 = xstrdup(value); | 144 | ctx.qry.sha1 = xstrdup(value); |
145 | ctx.qry.has_sha1 = 1; | 145 | ctx.qry.has_sha1 = 1; |
146 | } else if (!strcmp(name, "id2")) { | 146 | } else if (!strcmp(name, "id2")) { |
147 | ctx.qry.sha2 = xstrdup(value); | 147 | ctx.qry.sha2 = xstrdup(value); |
148 | ctx.qry.has_sha1 = 1; | 148 | ctx.qry.has_sha1 = 1; |
149 | } else if (!strcmp(name, "ofs")) { | 149 | } else if (!strcmp(name, "ofs")) { |
150 | ctx.qry.ofs = atoi(value); | 150 | ctx.qry.ofs = atoi(value); |
151 | } else if (!strcmp(name, "path")) { | 151 | } else if (!strcmp(name, "path")) { |
152 | ctx.qry.path = trim_end(value, '/'); | 152 | ctx.qry.path = trim_end(value, '/'); |
153 | } else if (!strcmp(name, "name")) { | 153 | } else if (!strcmp(name, "name")) { |
154 | ctx.qry.name = xstrdup(value); | 154 | ctx.qry.name = xstrdup(value); |
155 | } else if (!strcmp(name, "mimetype")) { | 155 | } else if (!strcmp(name, "mimetype")) { |
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 | } |
158 | } | 160 | } |
159 | 161 | ||
160 | static void prepare_context(struct cgit_context *ctx) | 162 | static void prepare_context(struct cgit_context *ctx) |
161 | { | 163 | { |
162 | memset(ctx, 0, sizeof(ctx)); | 164 | memset(ctx, 0, sizeof(ctx)); |
163 | ctx->cfg.agefile = "info/web/last-modified"; | 165 | ctx->cfg.agefile = "info/web/last-modified"; |
164 | ctx->cfg.nocache = 0; | 166 | ctx->cfg.nocache = 0; |
165 | ctx->cfg.cache_size = 0; | 167 | ctx->cfg.cache_size = 0; |
166 | ctx->cfg.cache_dynamic_ttl = 5; | 168 | ctx->cfg.cache_dynamic_ttl = 5; |
167 | ctx->cfg.cache_max_create_time = 5; | 169 | ctx->cfg.cache_max_create_time = 5; |
168 | ctx->cfg.cache_repo_ttl = 5; | 170 | ctx->cfg.cache_repo_ttl = 5; |
169 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 171 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
170 | ctx->cfg.cache_root_ttl = 5; | 172 | ctx->cfg.cache_root_ttl = 5; |
171 | ctx->cfg.cache_static_ttl = -1; | 173 | ctx->cfg.cache_static_ttl = -1; |
172 | ctx->cfg.css = "/cgit.css"; | 174 | ctx->cfg.css = "/cgit.css"; |
173 | ctx->cfg.logo = "/git-logo.png"; | 175 | ctx->cfg.logo = "/git-logo.png"; |
174 | ctx->cfg.local_time = 0; | 176 | ctx->cfg.local_time = 0; |
175 | ctx->cfg.max_repo_count = 50; | 177 | ctx->cfg.max_repo_count = 50; |
176 | ctx->cfg.max_commit_count = 50; | 178 | ctx->cfg.max_commit_count = 50; |
177 | ctx->cfg.max_lock_attempts = 5; | 179 | ctx->cfg.max_lock_attempts = 5; |
178 | ctx->cfg.max_msg_len = 80; | 180 | ctx->cfg.max_msg_len = 80; |
179 | ctx->cfg.max_repodesc_len = 80; | 181 | ctx->cfg.max_repodesc_len = 80; |
180 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 182 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
181 | ctx->cfg.renamelimit = -1; | 183 | ctx->cfg.renamelimit = -1; |
182 | ctx->cfg.robots = "index, nofollow"; | 184 | ctx->cfg.robots = "index, nofollow"; |
183 | ctx->cfg.root_title = "Git repository browser"; | 185 | ctx->cfg.root_title = "Git repository browser"; |
184 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 186 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
185 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 187 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
186 | ctx->cfg.summary_branches = 10; | 188 | ctx->cfg.summary_branches = 10; |
187 | ctx->cfg.summary_log = 10; | 189 | ctx->cfg.summary_log = 10; |
188 | ctx->cfg.summary_tags = 10; | 190 | ctx->cfg.summary_tags = 10; |
189 | ctx->page.mimetype = "text/html"; | 191 | ctx->page.mimetype = "text/html"; |
190 | ctx->page.charset = PAGE_ENCODING; | 192 | ctx->page.charset = PAGE_ENCODING; |
191 | ctx->page.filename = NULL; | 193 | ctx->page.filename = NULL; |
192 | ctx->page.size = 0; | 194 | ctx->page.size = 0; |
193 | ctx->page.modified = time(NULL); | 195 | ctx->page.modified = time(NULL); |
194 | ctx->page.expires = ctx->page.modified; | 196 | ctx->page.expires = ctx->page.modified; |
195 | } | 197 | } |
196 | 198 | ||
197 | struct refmatch { | 199 | struct refmatch { |
198 | char *req_ref; | 200 | char *req_ref; |
199 | char *first_ref; | 201 | char *first_ref; |
200 | int match; | 202 | int match; |
201 | }; | 203 | }; |
202 | 204 | ||
203 | int find_current_ref(const char *refname, const unsigned char *sha1, | 205 | int find_current_ref(const char *refname, const unsigned char *sha1, |
204 | int flags, void *cb_data) | 206 | int flags, void *cb_data) |
@@ -16,156 +16,158 @@ | |||
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 19 | #include <utf8.h> |
20 | 20 | ||
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Dateformats used on misc. pages | 23 | * Dateformats used on misc. pages |
24 | */ | 24 | */ |
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
26 | #define FMT_SHORTDATE "%Y-%m-%d" | 26 | #define FMT_SHORTDATE "%Y-%m-%d" |
27 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 27 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
28 | 28 | ||
29 | 29 | ||
30 | /* | 30 | /* |
31 | * Limits used for relative dates | 31 | * Limits used for relative dates |
32 | */ | 32 | */ |
33 | #define TM_MIN 60 | 33 | #define TM_MIN 60 |
34 | #define TM_HOUR (TM_MIN * 60) | 34 | #define TM_HOUR (TM_MIN * 60) |
35 | #define TM_DAY (TM_HOUR * 24) | 35 | #define TM_DAY (TM_HOUR * 24) |
36 | #define TM_WEEK (TM_DAY * 7) | 36 | #define TM_WEEK (TM_DAY * 7) |
37 | #define TM_YEAR (TM_DAY * 365) | 37 | #define TM_YEAR (TM_DAY * 365) |
38 | #define TM_MONTH (TM_YEAR / 12.0) | 38 | #define TM_MONTH (TM_YEAR / 12.0) |
39 | 39 | ||
40 | 40 | ||
41 | /* | 41 | /* |
42 | * Default encoding | 42 | * Default encoding |
43 | */ | 43 | */ |
44 | #define PAGE_ENCODING "UTF-8" | 44 | #define PAGE_ENCODING "UTF-8" |
45 | 45 | ||
46 | typedef void (*configfn)(const char *name, const char *value); | 46 | typedef void (*configfn)(const char *name, const char *value); |
47 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 47 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
48 | typedef void (*linediff_fn)(char *line, int len); | 48 | typedef void (*linediff_fn)(char *line, int len); |
49 | 49 | ||
50 | struct cgit_repo { | 50 | struct cgit_repo { |
51 | char *url; | 51 | char *url; |
52 | char *name; | 52 | char *name; |
53 | char *path; | 53 | char *path; |
54 | char *desc; | 54 | char *desc; |
55 | char *owner; | 55 | char *owner; |
56 | char *defbranch; | 56 | char *defbranch; |
57 | char *group; | 57 | char *group; |
58 | char *module_link; | 58 | char *module_link; |
59 | char *readme; | 59 | char *readme; |
60 | char *clone_url; | 60 | char *clone_url; |
61 | int snapshots; | 61 | int snapshots; |
62 | int enable_log_filecount; | 62 | int enable_log_filecount; |
63 | int enable_log_linecount; | 63 | int enable_log_linecount; |
64 | time_t mtime; | ||
64 | }; | 65 | }; |
65 | 66 | ||
66 | struct cgit_repolist { | 67 | struct cgit_repolist { |
67 | int length; | 68 | int length; |
68 | int count; | 69 | int count; |
69 | struct cgit_repo *repos; | 70 | struct cgit_repo *repos; |
70 | }; | 71 | }; |
71 | 72 | ||
72 | struct commitinfo { | 73 | struct commitinfo { |
73 | struct commit *commit; | 74 | struct commit *commit; |
74 | char *author; | 75 | char *author; |
75 | char *author_email; | 76 | char *author_email; |
76 | unsigned long author_date; | 77 | unsigned long author_date; |
77 | char *committer; | 78 | char *committer; |
78 | char *committer_email; | 79 | char *committer_email; |
79 | unsigned long committer_date; | 80 | unsigned long committer_date; |
80 | char *subject; | 81 | char *subject; |
81 | char *msg; | 82 | char *msg; |
82 | char *msg_encoding; | 83 | char *msg_encoding; |
83 | }; | 84 | }; |
84 | 85 | ||
85 | struct taginfo { | 86 | struct taginfo { |
86 | char *tagger; | 87 | char *tagger; |
87 | char *tagger_email; | 88 | char *tagger_email; |
88 | unsigned long tagger_date; | 89 | unsigned long tagger_date; |
89 | char *msg; | 90 | char *msg; |
90 | }; | 91 | }; |
91 | 92 | ||
92 | struct refinfo { | 93 | struct refinfo { |
93 | const char *refname; | 94 | const char *refname; |
94 | struct object *object; | 95 | struct object *object; |
95 | union { | 96 | union { |
96 | struct taginfo *tag; | 97 | struct taginfo *tag; |
97 | struct commitinfo *commit; | 98 | struct commitinfo *commit; |
98 | }; | 99 | }; |
99 | }; | 100 | }; |
100 | 101 | ||
101 | struct reflist { | 102 | struct reflist { |
102 | struct refinfo **refs; | 103 | struct refinfo **refs; |
103 | int alloc; | 104 | int alloc; |
104 | int count; | 105 | int count; |
105 | }; | 106 | }; |
106 | 107 | ||
107 | struct cgit_query { | 108 | struct cgit_query { |
108 | int has_symref; | 109 | int has_symref; |
109 | int has_sha1; | 110 | int has_sha1; |
110 | char *raw; | 111 | char *raw; |
111 | char *repo; | 112 | char *repo; |
112 | char *page; | 113 | char *page; |
113 | char *search; | 114 | char *search; |
114 | char *grep; | 115 | char *grep; |
115 | char *head; | 116 | char *head; |
116 | char *sha1; | 117 | char *sha1; |
117 | char *sha2; | 118 | char *sha2; |
118 | char *path; | 119 | char *path; |
119 | char *name; | 120 | char *name; |
120 | char *mimetype; | 121 | char *mimetype; |
121 | char *url; | 122 | char *url; |
122 | int ofs; | 123 | int ofs; |
123 | int nohead; | 124 | int nohead; |
125 | char *sort; | ||
124 | }; | 126 | }; |
125 | 127 | ||
126 | struct cgit_config { | 128 | struct cgit_config { |
127 | char *agefile; | 129 | char *agefile; |
128 | char *cache_root; | 130 | char *cache_root; |
129 | char *clone_prefix; | 131 | char *clone_prefix; |
130 | char *css; | 132 | char *css; |
131 | char *favicon; | 133 | char *favicon; |
132 | char *footer; | 134 | char *footer; |
133 | char *index_header; | 135 | char *index_header; |
134 | char *index_info; | 136 | char *index_info; |
135 | char *logo; | 137 | char *logo; |
136 | char *logo_link; | 138 | char *logo_link; |
137 | char *module_link; | 139 | char *module_link; |
138 | char *repo_group; | 140 | char *repo_group; |
139 | char *robots; | 141 | char *robots; |
140 | char *root_title; | 142 | char *root_title; |
141 | char *root_desc; | 143 | char *root_desc; |
142 | char *root_readme; | 144 | char *root_readme; |
143 | char *script_name; | 145 | char *script_name; |
144 | char *virtual_root; | 146 | char *virtual_root; |
145 | int cache_size; | 147 | int cache_size; |
146 | int cache_dynamic_ttl; | 148 | int cache_dynamic_ttl; |
147 | int cache_max_create_time; | 149 | int cache_max_create_time; |
148 | int cache_repo_ttl; | 150 | int cache_repo_ttl; |
149 | int cache_root_ttl; | 151 | int cache_root_ttl; |
150 | int cache_static_ttl; | 152 | int cache_static_ttl; |
151 | int enable_index_links; | 153 | int enable_index_links; |
152 | int enable_log_filecount; | 154 | int enable_log_filecount; |
153 | int enable_log_linecount; | 155 | int enable_log_linecount; |
154 | int local_time; | 156 | int local_time; |
155 | int max_repo_count; | 157 | int max_repo_count; |
156 | int max_commit_count; | 158 | int max_commit_count; |
157 | int max_lock_attempts; | 159 | int max_lock_attempts; |
158 | int max_msg_len; | 160 | int max_msg_len; |
159 | int max_repodesc_len; | 161 | int max_repodesc_len; |
160 | int nocache; | 162 | int nocache; |
161 | int renamelimit; | 163 | int renamelimit; |
162 | int snapshots; | 164 | int snapshots; |
163 | int summary_branches; | 165 | int summary_branches; |
164 | int summary_log; | 166 | int summary_log; |
165 | int summary_tags; | 167 | int summary_tags; |
166 | }; | 168 | }; |
167 | 169 | ||
168 | struct cgit_page { | 170 | struct cgit_page { |
169 | time_t modified; | 171 | time_t modified; |
170 | time_t expires; | 172 | time_t expires; |
171 | size_t size; | 173 | size_t size; |
@@ -15,96 +15,97 @@ int cgit_cmd; | |||
15 | int chk_zero(int result, char *msg) | 15 | int chk_zero(int result, char *msg) |
16 | { | 16 | { |
17 | if (result != 0) | 17 | if (result != 0) |
18 | die("%s: %s", msg, strerror(errno)); | 18 | die("%s: %s", msg, strerror(errno)); |
19 | return result; | 19 | return result; |
20 | } | 20 | } |
21 | 21 | ||
22 | int chk_positive(int result, char *msg) | 22 | int chk_positive(int result, char *msg) |
23 | { | 23 | { |
24 | if (result <= 0) | 24 | if (result <= 0) |
25 | die("%s: %s", msg, strerror(errno)); | 25 | die("%s: %s", msg, strerror(errno)); |
26 | return result; | 26 | return result; |
27 | } | 27 | } |
28 | 28 | ||
29 | int chk_non_negative(int result, char *msg) | 29 | int chk_non_negative(int result, char *msg) |
30 | { | 30 | { |
31 | if (result < 0) | 31 | if (result < 0) |
32 | die("%s: %s",msg, strerror(errno)); | 32 | die("%s: %s",msg, strerror(errno)); |
33 | return result; | 33 | return result; |
34 | } | 34 | } |
35 | 35 | ||
36 | struct cgit_repo *cgit_add_repo(const char *url) | 36 | struct cgit_repo *cgit_add_repo(const char *url) |
37 | { | 37 | { |
38 | struct cgit_repo *ret; | 38 | struct cgit_repo *ret; |
39 | 39 | ||
40 | if (++cgit_repolist.count > cgit_repolist.length) { | 40 | if (++cgit_repolist.count > cgit_repolist.length) { |
41 | if (cgit_repolist.length == 0) | 41 | if (cgit_repolist.length == 0) |
42 | cgit_repolist.length = 8; | 42 | cgit_repolist.length = 8; |
43 | else | 43 | else |
44 | cgit_repolist.length *= 2; | 44 | cgit_repolist.length *= 2; |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
46 | cgit_repolist.length * | 46 | cgit_repolist.length * |
47 | sizeof(struct cgit_repo)); | 47 | sizeof(struct cgit_repo)); |
48 | } | 48 | } |
49 | 49 | ||
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 52 | ret->name = ret->url; |
53 | ret->path = NULL; | 53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 55 | ret->owner = NULL; |
56 | ret->group = ctx.cfg.repo_group; | 56 | ret->group = ctx.cfg.repo_group; |
57 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->module_link = ctx.cfg.module_link; | 61 | ret->module_link = ctx.cfg.module_link; |
62 | ret->readme = NULL; | 62 | ret->readme = NULL; |
63 | ret->mtime = -1; | ||
63 | return ret; | 64 | return ret; |
64 | } | 65 | } |
65 | 66 | ||
66 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 67 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
67 | { | 68 | { |
68 | int i; | 69 | int i; |
69 | struct cgit_repo *repo; | 70 | struct cgit_repo *repo; |
70 | 71 | ||
71 | for (i=0; i<cgit_repolist.count; i++) { | 72 | for (i=0; i<cgit_repolist.count; i++) { |
72 | repo = &cgit_repolist.repos[i]; | 73 | repo = &cgit_repolist.repos[i]; |
73 | if (!strcmp(repo->url, url)) | 74 | if (!strcmp(repo->url, url)) |
74 | return repo; | 75 | return repo; |
75 | } | 76 | } |
76 | return NULL; | 77 | return NULL; |
77 | } | 78 | } |
78 | 79 | ||
79 | void *cgit_free_commitinfo(struct commitinfo *info) | 80 | void *cgit_free_commitinfo(struct commitinfo *info) |
80 | { | 81 | { |
81 | free(info->author); | 82 | free(info->author); |
82 | free(info->author_email); | 83 | free(info->author_email); |
83 | free(info->committer); | 84 | free(info->committer); |
84 | free(info->committer_email); | 85 | free(info->committer_email); |
85 | free(info->subject); | 86 | free(info->subject); |
86 | free(info->msg); | 87 | free(info->msg); |
87 | free(info->msg_encoding); | 88 | free(info->msg_encoding); |
88 | free(info); | 89 | free(info); |
89 | return NULL; | 90 | return NULL; |
90 | } | 91 | } |
91 | 92 | ||
92 | char *trim_end(const char *str, char c) | 93 | char *trim_end(const char *str, char c) |
93 | { | 94 | { |
94 | int len; | 95 | int len; |
95 | char *s, *t; | 96 | char *s, *t; |
96 | 97 | ||
97 | if (str == NULL) | 98 | if (str == NULL) |
98 | return NULL; | 99 | return NULL; |
99 | t = (char *)str; | 100 | t = (char *)str; |
100 | len = strlen(t); | 101 | len = strlen(t); |
101 | while(len > 0 && t[len - 1] == c) | 102 | while(len > 0 && t[len - 1] == c) |
102 | len--; | 103 | len--; |
103 | 104 | ||
104 | if (len == 0) | 105 | if (len == 0) |
105 | return NULL; | 106 | return NULL; |
106 | 107 | ||
107 | c = t[len]; | 108 | c = t[len]; |
108 | t[len] = '\0'; | 109 | t[len] = '\0'; |
109 | s = xstrdup(t); | 110 | s = xstrdup(t); |
110 | t[len] = c; | 111 | t[len] = c; |
diff --git a/ui-repolist.c b/ui-repolist.c index 2324273..87196f0 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -1,171 +1,278 @@ | |||
1 | /* ui-repolist.c: functions for generating the repolist page | 1 | /* ui-repolist.c: functions for generating the repolist page |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | /* This is needed for strcasestr to be defined by <string.h> */ | 9 | /* This is needed for strcasestr to be defined by <string.h> */ |
10 | #define _GNU_SOURCE 1 | 10 | #define _GNU_SOURCE 1 |
11 | #include <string.h> | 11 | #include <string.h> |
12 | 12 | ||
13 | #include <time.h> | 13 | #include <time.h> |
14 | 14 | ||
15 | #include "cgit.h" | 15 | #include "cgit.h" |
16 | #include "html.h" | 16 | #include "html.h" |
17 | #include "ui-shared.h" | 17 | #include "ui-shared.h" |
18 | 18 | ||
19 | time_t read_agefile(char *path) | 19 | time_t read_agefile(char *path) |
20 | { | 20 | { |
21 | FILE *f; | 21 | FILE *f; |
22 | static char buf[64], buf2[64]; | 22 | static char buf[64], buf2[64]; |
23 | 23 | ||
24 | if (!(f = fopen(path, "r"))) | 24 | if (!(f = fopen(path, "r"))) |
25 | return -1; | 25 | return -1; |
26 | if (fgets(buf, sizeof(buf), f) == NULL) | 26 | if (fgets(buf, sizeof(buf), f) == NULL) |
27 | return -1; | 27 | return -1; |
28 | fclose(f); | 28 | fclose(f); |
29 | if (parse_date(buf, buf2, sizeof(buf2))) | 29 | if (parse_date(buf, buf2, sizeof(buf2))) |
30 | return strtoul(buf2, NULL, 10); | 30 | return strtoul(buf2, NULL, 10); |
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 | { |
54 | if (!ctx.qry.search) | 71 | if (!ctx.qry.search) |
55 | return 1; | 72 | return 1; |
56 | if (repo->url && strcasestr(repo->url, ctx.qry.search)) | 73 | if (repo->url && strcasestr(repo->url, ctx.qry.search)) |
57 | return 1; | 74 | return 1; |
58 | if (repo->name && strcasestr(repo->name, ctx.qry.search)) | 75 | if (repo->name && strcasestr(repo->name, ctx.qry.search)) |
59 | return 1; | 76 | return 1; |
60 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) | 77 | if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) |
61 | return 1; | 78 | return 1; |
62 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) | 79 | if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) |
63 | return 1; | 80 | return 1; |
64 | return 0; | 81 | return 0; |
65 | } | 82 | } |
66 | 83 | ||
67 | int is_in_url(struct cgit_repo *repo) | 84 | int is_in_url(struct cgit_repo *repo) |
68 | { | 85 | { |
69 | if (!ctx.qry.url) | 86 | if (!ctx.qry.url) |
70 | return 1; | 87 | return 1; |
71 | if (repo->url && !prefixcmp(repo->url, ctx.qry.url)) | 88 | if (repo->url && !prefixcmp(repo->url, ctx.qry.url)) |
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 | } |
87 | 114 | ||
88 | 115 | ||
89 | void print_pager(int items, int pagelen, char *search) | 116 | void print_pager(int items, int pagelen, char *search) |
90 | { | 117 | { |
91 | int i; | 118 | int i; |
92 | html("<div class='pager'>"); | 119 | html("<div class='pager'>"); |
93 | for(i = 0; i * pagelen < items; i++) | 120 | for(i = 0; i * pagelen < items; i++) |
94 | cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, | 121 | cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, |
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 | ||
107 | ctx.page.title = ctx.cfg.root_title; | 210 | ctx.page.title = ctx.cfg.root_title; |
108 | cgit_print_http_headers(&ctx); | 211 | cgit_print_http_headers(&ctx); |
109 | cgit_print_docstart(&ctx); | 212 | cgit_print_docstart(&ctx); |
110 | cgit_print_pageheader(&ctx); | 213 | cgit_print_pageheader(&ctx); |
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))) |
119 | continue; | 225 | continue; |
120 | hits++; | 226 | hits++; |
121 | if (hits <= ctx.qry.ofs) | 227 | if (hits <= ctx.qry.ofs) |
122 | continue; | 228 | continue; |
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); |
143 | html_link_close(); | 250 | html_link_close(); |
144 | html("</td><td>"); | 251 | html("</td><td>"); |
145 | html_txt(ctx.repo->owner); | 252 | html_txt(ctx.repo->owner); |
146 | html("</td><td>"); | 253 | html("</td><td>"); |
147 | print_modtime(ctx.repo); | 254 | print_modtime(ctx.repo); |
148 | html("</td>"); | 255 | html("</td>"); |
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); |
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"); |
158 | } | 265 | } |
159 | html("</table>"); | 266 | html("</table>"); |
160 | if (!hits) | 267 | if (!hits) |
161 | cgit_print_error("No repositories found"); | 268 | cgit_print_error("No repositories found"); |
162 | else if (hits > ctx.cfg.max_repo_count) | 269 | else if (hits > ctx.cfg.max_repo_count) |
163 | print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); | 270 | print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); |
164 | cgit_print_docend(); | 271 | cgit_print_docend(); |
165 | } | 272 | } |
166 | 273 | ||
167 | void cgit_print_site_readme() | 274 | void cgit_print_site_readme() |
168 | { | 275 | { |
169 | if (ctx.cfg.root_readme) | 276 | if (ctx.cfg.root_readme) |
170 | html_include(ctx.cfg.root_readme); | 277 | html_include(ctx.cfg.root_readme); |
171 | } | 278 | } |