summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
-rw-r--r--cgit.css10
-rw-r--r--cgit.h1
-rw-r--r--ui-repolist.c19
4 files changed, 32 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index ccd61f4..2036ceb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -44,48 +44,50 @@ void config_cb(const char *name, const char *value)
44 else if (!strcmp(name, "snapshots")) 44 else if (!strcmp(name, "snapshots"))
45 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 45 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
46 else if (!strcmp(name, "enable-index-links")) 46 else if (!strcmp(name, "enable-index-links"))
47 ctx.cfg.enable_index_links = atoi(value); 47 ctx.cfg.enable_index_links = atoi(value);
48 else if (!strcmp(name, "enable-log-filecount")) 48 else if (!strcmp(name, "enable-log-filecount"))
49 ctx.cfg.enable_log_filecount = atoi(value); 49 ctx.cfg.enable_log_filecount = atoi(value);
50 else if (!strcmp(name, "enable-log-linecount")) 50 else if (!strcmp(name, "enable-log-linecount"))
51 ctx.cfg.enable_log_linecount = atoi(value); 51 ctx.cfg.enable_log_linecount = atoi(value);
52 else if (!strcmp(name, "cache-size")) 52 else if (!strcmp(name, "cache-size"))
53 ctx.cfg.cache_size = atoi(value); 53 ctx.cfg.cache_size = atoi(value);
54 else if (!strcmp(name, "cache-root")) 54 else if (!strcmp(name, "cache-root"))
55 ctx.cfg.cache_root = xstrdup(value); 55 ctx.cfg.cache_root = xstrdup(value);
56 else if (!strcmp(name, "cache-root-ttl")) 56 else if (!strcmp(name, "cache-root-ttl"))
57 ctx.cfg.cache_root_ttl = atoi(value); 57 ctx.cfg.cache_root_ttl = atoi(value);
58 else if (!strcmp(name, "cache-repo-ttl")) 58 else if (!strcmp(name, "cache-repo-ttl"))
59 ctx.cfg.cache_repo_ttl = atoi(value); 59 ctx.cfg.cache_repo_ttl = atoi(value);
60 else if (!strcmp(name, "cache-static-ttl")) 60 else if (!strcmp(name, "cache-static-ttl"))
61 ctx.cfg.cache_static_ttl = atoi(value); 61 ctx.cfg.cache_static_ttl = atoi(value);
62 else if (!strcmp(name, "cache-dynamic-ttl")) 62 else if (!strcmp(name, "cache-dynamic-ttl"))
63 ctx.cfg.cache_dynamic_ttl = atoi(value); 63 ctx.cfg.cache_dynamic_ttl = atoi(value);
64 else if (!strcmp(name, "max-message-length")) 64 else if (!strcmp(name, "max-message-length"))
65 ctx.cfg.max_msg_len = atoi(value); 65 ctx.cfg.max_msg_len = atoi(value);
66 else if (!strcmp(name, "max-repodesc-length")) 66 else if (!strcmp(name, "max-repodesc-length"))
67 ctx.cfg.max_repodesc_len = atoi(value); 67 ctx.cfg.max_repodesc_len = atoi(value);
68 else if (!strcmp(name, "max-repo-count"))
69 ctx.cfg.max_repo_count = atoi(value);
68 else if (!strcmp(name, "max-commit-count")) 70 else if (!strcmp(name, "max-commit-count"))
69 ctx.cfg.max_commit_count = atoi(value); 71 ctx.cfg.max_commit_count = atoi(value);
70 else if (!strcmp(name, "summary-log")) 72 else if (!strcmp(name, "summary-log"))
71 ctx.cfg.summary_log = atoi(value); 73 ctx.cfg.summary_log = atoi(value);
72 else if (!strcmp(name, "summary-branches")) 74 else if (!strcmp(name, "summary-branches"))
73 ctx.cfg.summary_branches = atoi(value); 75 ctx.cfg.summary_branches = atoi(value);
74 else if (!strcmp(name, "summary-tags")) 76 else if (!strcmp(name, "summary-tags"))
75 ctx.cfg.summary_tags = atoi(value); 77 ctx.cfg.summary_tags = atoi(value);
76 else if (!strcmp(name, "agefile")) 78 else if (!strcmp(name, "agefile"))
77 ctx.cfg.agefile = xstrdup(value); 79 ctx.cfg.agefile = xstrdup(value);
78 else if (!strcmp(name, "renamelimit")) 80 else if (!strcmp(name, "renamelimit"))
79 ctx.cfg.renamelimit = atoi(value); 81 ctx.cfg.renamelimit = atoi(value);
80 else if (!strcmp(name, "robots")) 82 else if (!strcmp(name, "robots"))
81 ctx.cfg.robots = xstrdup(value); 83 ctx.cfg.robots = xstrdup(value);
82 else if (!strcmp(name, "clone-prefix")) 84 else if (!strcmp(name, "clone-prefix"))
83 ctx.cfg.clone_prefix = xstrdup(value); 85 ctx.cfg.clone_prefix = xstrdup(value);
84 else if (!strcmp(name, "repo.group")) 86 else if (!strcmp(name, "repo.group"))
85 ctx.cfg.repo_group = xstrdup(value); 87 ctx.cfg.repo_group = xstrdup(value);
86 else if (!strcmp(name, "repo.url")) 88 else if (!strcmp(name, "repo.url"))
87 ctx.repo = cgit_add_repo(value); 89 ctx.repo = cgit_add_repo(value);
88 else if (!strcmp(name, "repo.name")) 90 else if (!strcmp(name, "repo.name"))
89 ctx.repo->name = xstrdup(value); 91 ctx.repo->name = xstrdup(value);
90 else if (ctx.repo && !strcmp(name, "repo.path")) 92 else if (ctx.repo && !strcmp(name, "repo.path"))
91 ctx.repo->path = trim_end(value, '/'); 93 ctx.repo->path = trim_end(value, '/');
@@ -138,48 +140,49 @@ static void querystring_cb(const char *name, const char *value)
138 ctx.qry.has_sha1 = 1; 140 ctx.qry.has_sha1 = 1;
139 } else if (!strcmp(name, "ofs")) { 141 } else if (!strcmp(name, "ofs")) {
140 ctx.qry.ofs = atoi(value); 142 ctx.qry.ofs = atoi(value);
141 } else if (!strcmp(name, "path")) { 143 } else if (!strcmp(name, "path")) {
142 ctx.qry.path = trim_end(value, '/'); 144 ctx.qry.path = trim_end(value, '/');
143 } else if (!strcmp(name, "name")) { 145 } else if (!strcmp(name, "name")) {
144 ctx.qry.name = xstrdup(value); 146 ctx.qry.name = xstrdup(value);
145 } 147 }
146} 148}
147 149
148static void prepare_context(struct cgit_context *ctx) 150static void prepare_context(struct cgit_context *ctx)
149{ 151{
150 memset(ctx, 0, sizeof(ctx)); 152 memset(ctx, 0, sizeof(ctx));
151 ctx->cfg.agefile = "info/web/last-modified"; 153 ctx->cfg.agefile = "info/web/last-modified";
152 ctx->cfg.nocache = 0; 154 ctx->cfg.nocache = 0;
153 ctx->cfg.cache_size = 0; 155 ctx->cfg.cache_size = 0;
154 ctx->cfg.cache_dynamic_ttl = 5; 156 ctx->cfg.cache_dynamic_ttl = 5;
155 ctx->cfg.cache_max_create_time = 5; 157 ctx->cfg.cache_max_create_time = 5;
156 ctx->cfg.cache_repo_ttl = 5; 158 ctx->cfg.cache_repo_ttl = 5;
157 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 159 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
158 ctx->cfg.cache_root_ttl = 5; 160 ctx->cfg.cache_root_ttl = 5;
159 ctx->cfg.cache_static_ttl = -1; 161 ctx->cfg.cache_static_ttl = -1;
160 ctx->cfg.css = "/cgit.css"; 162 ctx->cfg.css = "/cgit.css";
161 ctx->cfg.logo = "/git-logo.png"; 163 ctx->cfg.logo = "/git-logo.png";
164 ctx->cfg.max_repo_count = 50;
162 ctx->cfg.max_commit_count = 50; 165 ctx->cfg.max_commit_count = 50;
163 ctx->cfg.max_lock_attempts = 5; 166 ctx->cfg.max_lock_attempts = 5;
164 ctx->cfg.max_msg_len = 60; 167 ctx->cfg.max_msg_len = 60;
165 ctx->cfg.max_repodesc_len = 60; 168 ctx->cfg.max_repodesc_len = 60;
166 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 169 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
167 ctx->cfg.renamelimit = -1; 170 ctx->cfg.renamelimit = -1;
168 ctx->cfg.robots = "index, nofollow"; 171 ctx->cfg.robots = "index, nofollow";
169 ctx->cfg.root_title = "Git repository browser"; 172 ctx->cfg.root_title = "Git repository browser";
170 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 173 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
171 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 174 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
172 ctx->page.mimetype = "text/html"; 175 ctx->page.mimetype = "text/html";
173 ctx->page.charset = PAGE_ENCODING; 176 ctx->page.charset = PAGE_ENCODING;
174 ctx->page.filename = NULL; 177 ctx->page.filename = NULL;
175 ctx->page.modified = time(NULL); 178 ctx->page.modified = time(NULL);
176 ctx->page.expires = ctx->page.modified; 179 ctx->page.expires = ctx->page.modified;
177} 180}
178 181
179struct refmatch { 182struct refmatch {
180 char *req_ref; 183 char *req_ref;
181 char *first_ref; 184 char *first_ref;
182 int match; 185 int match;
183}; 186};
184 187
185int find_current_ref(const char *refname, const unsigned char *sha1, 188int find_current_ref(const char *refname, const unsigned char *sha1,
diff --git a/cgit.css b/cgit.css
index 30cb8e6..d57722c 100644
--- a/cgit.css
+++ b/cgit.css
@@ -392,48 +392,58 @@ table.list td.repogroup {
392 color: #888; 392 color: #888;
393} 393}
394 394
395a.button { 395a.button {
396 font-size: 80%; 396 font-size: 80%;
397 padding: 0em 0.5em; 397 padding: 0em 0.5em;
398} 398}
399 399
400a.primary { 400a.primary {
401 font-size: 100%; 401 font-size: 100%;
402} 402}
403 403
404a.secondary { 404a.secondary {
405 font-size: 90%; 405 font-size: 90%;
406} 406}
407 407
408td.toplevel-repo { 408td.toplevel-repo {
409 409
410} 410}
411 411
412table.list td.sublevel-repo { 412table.list td.sublevel-repo {
413 padding-left: 1.5em; 413 padding-left: 1.5em;
414} 414}
415 415
416div.pager {
417 text-align: center;
418 margin: 1em 0em 0em 0em;
419}
420
421div.pager a {
422 color: #777;
423 margin: 0em 0.5em;
424}
425
416span.age-mins { 426span.age-mins {
417 font-weight: bold; 427 font-weight: bold;
418 color: #080; 428 color: #080;
419} 429}
420 430
421span.age-hours { 431span.age-hours {
422 color: #080; 432 color: #080;
423} 433}
424 434
425span.age-days { 435span.age-days {
426 color: #040; 436 color: #040;
427} 437}
428 438
429span.age-weeks { 439span.age-weeks {
430 color: #444; 440 color: #444;
431} 441}
432 442
433span.age-months { 443span.age-months {
434 color: #888; 444 color: #888;
435} 445}
436 446
437span.age-years { 447span.age-years {
438 color: #bbb; 448 color: #bbb;
439} 449}
diff --git a/cgit.h b/cgit.h
index bbb404e..4fa5cf2 100644
--- a/cgit.h
+++ b/cgit.h
@@ -124,48 +124,49 @@ struct cgit_config {
124 char *cache_root; 124 char *cache_root;
125 char *clone_prefix; 125 char *clone_prefix;
126 char *css; 126 char *css;
127 char *index_header; 127 char *index_header;
128 char *index_info; 128 char *index_info;
129 char *logo; 129 char *logo;
130 char *logo_link; 130 char *logo_link;
131 char *module_link; 131 char *module_link;
132 char *repo_group; 132 char *repo_group;
133 char *robots; 133 char *robots;
134 char *root_title; 134 char *root_title;
135 char *root_desc; 135 char *root_desc;
136 char *root_readme; 136 char *root_readme;
137 char *script_name; 137 char *script_name;
138 char *virtual_root; 138 char *virtual_root;
139 int cache_size; 139 int cache_size;
140 int cache_dynamic_ttl; 140 int cache_dynamic_ttl;
141 int cache_max_create_time; 141 int cache_max_create_time;
142 int cache_repo_ttl; 142 int cache_repo_ttl;
143 int cache_root_ttl; 143 int cache_root_ttl;
144 int cache_static_ttl; 144 int cache_static_ttl;
145 int enable_index_links; 145 int enable_index_links;
146 int enable_log_filecount; 146 int enable_log_filecount;
147 int enable_log_linecount; 147 int enable_log_linecount;
148 int max_repo_count;
148 int max_commit_count; 149 int max_commit_count;
149 int max_lock_attempts; 150 int max_lock_attempts;
150 int max_msg_len; 151 int max_msg_len;
151 int max_repodesc_len; 152 int max_repodesc_len;
152 int nocache; 153 int nocache;
153 int renamelimit; 154 int renamelimit;
154 int snapshots; 155 int snapshots;
155 int summary_branches; 156 int summary_branches;
156 int summary_log; 157 int summary_log;
157 int summary_tags; 158 int summary_tags;
158}; 159};
159 160
160struct cgit_page { 161struct cgit_page {
161 time_t modified; 162 time_t modified;
162 time_t expires; 163 time_t expires;
163 char *mimetype; 164 char *mimetype;
164 char *charset; 165 char *charset;
165 char *filename; 166 char *filename;
166 char *title; 167 char *title;
167}; 168};
168 169
169struct cgit_context { 170struct cgit_context {
170 struct cgit_query qry; 171 struct cgit_query qry;
171 struct cgit_config cfg; 172 struct cgit_config cfg;
diff --git a/ui-repolist.c b/ui-repolist.c
index 3f78e28..ee4facb 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -50,95 +50,112 @@ int is_match(struct cgit_repo *repo)
50 return 1; 50 return 1;
51 if (repo->url && strcasestr(repo->url, ctx.qry.search)) 51 if (repo->url && strcasestr(repo->url, ctx.qry.search))
52 return 1; 52 return 1;
53 if (repo->name && strcasestr(repo->name, ctx.qry.search)) 53 if (repo->name && strcasestr(repo->name, ctx.qry.search))
54 return 1; 54 return 1;
55 if (repo->desc && strcasestr(repo->desc, ctx.qry.search)) 55 if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
56 return 1; 56 return 1;
57 if (repo->owner && strcasestr(repo->owner, ctx.qry.search)) 57 if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
58 return 1; 58 return 1;
59 return 0; 59 return 0;
60} 60}
61 61
62void print_header(int columns) 62void print_header(int columns)
63{ 63{
64 html("<tr class='nohover'>" 64 html("<tr class='nohover'>"
65 "<th class='left'>Name</th>" 65 "<th class='left'>Name</th>"
66 "<th class='left'>Description</th>" 66 "<th class='left'>Description</th>"
67 "<th class='left'>Owner</th>" 67 "<th class='left'>Owner</th>"
68 "<th class='left'>Idle</th>"); 68 "<th class='left'>Idle</th>");
69 if (ctx.cfg.enable_index_links) 69 if (ctx.cfg.enable_index_links)
70 html("<th class='left'>Links</th>"); 70 html("<th class='left'>Links</th>");
71 html("</tr>\n"); 71 html("</tr>\n");
72} 72}
73 73
74
75void print_pager(int items, int pagelen, char *search)
76{
77 int i;
78 html("<div class='pager'>");
79 for(i = 0; i * pagelen < items; i++)
80 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
81 search, i * pagelen);
82 html("</div>");
83}
84
74void cgit_print_repolist() 85void cgit_print_repolist()
75{ 86{
76 int i, columns = 4, hits = 0, header = 0; 87 int i, columns = 4, hits = 0, header = 0;
77 char *last_group = NULL; 88 char *last_group = NULL;
78 89
79 if (ctx.cfg.enable_index_links) 90 if (ctx.cfg.enable_index_links)
80 columns++; 91 columns++;
81 92
82 ctx.page.title = ctx.cfg.root_title; 93 ctx.page.title = ctx.cfg.root_title;
83 cgit_print_http_headers(&ctx); 94 cgit_print_http_headers(&ctx);
84 cgit_print_docstart(&ctx); 95 cgit_print_docstart(&ctx);
85 cgit_print_pageheader(&ctx); 96 cgit_print_pageheader(&ctx);
86 97
87 if (ctx.cfg.index_header) 98 if (ctx.cfg.index_header)
88 html_include(ctx.cfg.index_header); 99 html_include(ctx.cfg.index_header);
89 100
90 html("<table summary='repository list' class='list nowrap'>"); 101 html("<table summary='repository list' class='list nowrap'>");
91 for (i=0; i<cgit_repolist.count; i++) { 102 for (i=0; i<cgit_repolist.count; i++) {
92 ctx.repo = &cgit_repolist.repos[i]; 103 ctx.repo = &cgit_repolist.repos[i];
93 if (!is_match(ctx.repo)) 104 if (!is_match(ctx.repo))
94 continue; 105 continue;
106 hits++;
107 if (hits <= ctx.qry.ofs)
108 continue;
109 if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
110 continue;
95 if (!header++) 111 if (!header++)
96 print_header(columns); 112 print_header(columns);
97 hits++;
98 if ((last_group == NULL && ctx.repo->group != NULL) || 113 if ((last_group == NULL && ctx.repo->group != NULL) ||
99 (last_group != NULL && ctx.repo->group == NULL) || 114 (last_group != NULL && ctx.repo->group == NULL) ||
100 (last_group != NULL && ctx.repo->group != NULL && 115 (last_group != NULL && ctx.repo->group != NULL &&
101 strcmp(ctx.repo->group, last_group))) { 116 strcmp(ctx.repo->group, last_group))) {
102 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", 117 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
103 columns); 118 columns);
104 html_txt(ctx.repo->group); 119 html_txt(ctx.repo->group);
105 html("</td></tr>"); 120 html("</td></tr>");
106 last_group = ctx.repo->group; 121 last_group = ctx.repo->group;
107 } 122 }
108 htmlf("<tr><td class='%s'>", 123 htmlf("<tr><td class='%s'>",
109 ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); 124 ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
110 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); 125 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
111 html_txt(ctx.repo->name); 126 html_txt(ctx.repo->name);
112 html_link_close(); 127 html_link_close();
113 html("</td><td>"); 128 html("</td><td>");
114 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); 129 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
115 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); 130 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
116 html_link_close(); 131 html_link_close();
117 html("</td><td>"); 132 html("</td><td>");
118 html_txt(ctx.repo->owner); 133 html_txt(ctx.repo->owner);
119 html("</td><td>"); 134 html("</td><td>");
120 print_modtime(ctx.repo); 135 print_modtime(ctx.repo);
121 html("</td>"); 136 html("</td>");
122 if (ctx.cfg.enable_index_links) { 137 if (ctx.cfg.enable_index_links) {
123 html("<td>"); 138 html("<td>");
124 html_link_open(cgit_repourl(ctx.repo->url), 139 html_link_open(cgit_repourl(ctx.repo->url),
125 NULL, "button"); 140 NULL, "button");
126 html("summary</a>"); 141 html("summary</a>");
127 cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 142 cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
128 0, NULL, NULL); 143 0, NULL, NULL);
129 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); 144 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
130 html("</td>"); 145 html("</td>");
131 } 146 }
132 html("</tr>\n"); 147 html("</tr>\n");
133 } 148 }
134 html("</table>"); 149 html("</table>");
135 if (!hits) 150 if (!hits)
136 cgit_print_error("No repositories found"); 151 cgit_print_error("No repositories found");
152 else if (hits > ctx.cfg.max_repo_count)
153 print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
137 cgit_print_docend(); 154 cgit_print_docend();
138} 155}
139 156
140void cgit_print_site_readme() 157void cgit_print_site_readme()
141{ 158{
142 if (ctx.cfg.root_readme) 159 if (ctx.cfg.root_readme)
143 html_include(ctx.cfg.root_readme); 160 html_include(ctx.cfg.root_readme);
144} 161}