summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-09-14 18:18:10 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-09-15 21:35:34 (UTC)
commitdd80ef59e7cad0146b7e4812afa3f84ea3d1c7b8 (patch) (unidiff)
tree9cf8cbc2c29a6fb84fdbc0021dc9817aafac6617
parent93397a765b9d9af11b7d10c114406e303ea4fb1c (diff)
downloadcgit-dd80ef59e7cad0146b7e4812afa3f84ea3d1c7b8.zip
cgit-dd80ef59e7cad0146b7e4812afa3f84ea3d1c7b8.tar.gz
cgit-dd80ef59e7cad0146b7e4812afa3f84ea3d1c7b8.tar.bz2
ui-repolist: enable filtering of repos by path
If a repo url is specified but no exact match is found in the list of repos the url will now be used as a prefix-filter. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-repolist.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/ui-repolist.c b/ui-repolist.c
index ee4facb..725338b 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,161 +1,170 @@
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#include <time.h> 9#include <time.h>
10 10
11#include "cgit.h" 11#include "cgit.h"
12#include "html.h" 12#include "html.h"
13#include "ui-shared.h" 13#include "ui-shared.h"
14 14
15time_t read_agefile(char *path) 15time_t read_agefile(char *path)
16{ 16{
17 FILE *f; 17 FILE *f;
18 static char buf[64], buf2[64]; 18 static char buf[64], buf2[64];
19 19
20 if (!(f = fopen(path, "r"))) 20 if (!(f = fopen(path, "r")))
21 return -1; 21 return -1;
22 fgets(buf, sizeof(buf), f); 22 fgets(buf, sizeof(buf), f);
23 fclose(f); 23 fclose(f);
24 if (parse_date(buf, buf2, sizeof(buf2))) 24 if (parse_date(buf, buf2, sizeof(buf2)))
25 return strtoul(buf2, NULL, 10); 25 return strtoul(buf2, NULL, 10);
26 else 26 else
27 return 0; 27 return 0;
28} 28}
29 29
30static void print_modtime(struct cgit_repo *repo) 30static void print_modtime(struct cgit_repo *repo)
31{ 31{
32 char *path; 32 char *path;
33 struct stat s; 33 struct stat s;
34 34
35 path = fmt("%s/%s", repo->path, ctx.cfg.agefile); 35 path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
36 if (stat(path, &s) == 0) { 36 if (stat(path, &s) == 0) {
37 cgit_print_age(read_agefile(path), -1, NULL); 37 cgit_print_age(read_agefile(path), -1, NULL);
38 return; 38 return;
39 } 39 }
40 40
41 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); 41 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
42 if (stat(path, &s) != 0) 42 if (stat(path, &s) != 0)
43 return; 43 return;
44 cgit_print_age(s.st_mtime, -1, NULL); 44 cgit_print_age(s.st_mtime, -1, NULL);
45} 45}
46 46
47int is_match(struct cgit_repo *repo) 47int is_match(struct cgit_repo *repo)
48{ 48{
49 if (!ctx.qry.search) 49 if (!ctx.qry.search)
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
62int is_in_url(struct cgit_repo *repo)
63{
64 if (!ctx.qry.url)
65 return 1;
66 if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
67 return 1;
68 return 0;
69}
70
62void print_header(int columns) 71void print_header(int columns)
63{ 72{
64 html("<tr class='nohover'>" 73 html("<tr class='nohover'>"
65 "<th class='left'>Name</th>" 74 "<th class='left'>Name</th>"
66 "<th class='left'>Description</th>" 75 "<th class='left'>Description</th>"
67 "<th class='left'>Owner</th>" 76 "<th class='left'>Owner</th>"
68 "<th class='left'>Idle</th>"); 77 "<th class='left'>Idle</th>");
69 if (ctx.cfg.enable_index_links) 78 if (ctx.cfg.enable_index_links)
70 html("<th class='left'>Links</th>"); 79 html("<th class='left'>Links</th>");
71 html("</tr>\n"); 80 html("</tr>\n");
72} 81}
73 82
74 83
75void print_pager(int items, int pagelen, char *search) 84void print_pager(int items, int pagelen, char *search)
76{ 85{
77 int i; 86 int i;
78 html("<div class='pager'>"); 87 html("<div class='pager'>");
79 for(i = 0; i * pagelen < items; i++) 88 for(i = 0; i * pagelen < items; i++)
80 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, 89 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
81 search, i * pagelen); 90 search, i * pagelen);
82 html("</div>"); 91 html("</div>");
83} 92}
84 93
85void cgit_print_repolist() 94void cgit_print_repolist()
86{ 95{
87 int i, columns = 4, hits = 0, header = 0; 96 int i, columns = 4, hits = 0, header = 0;
88 char *last_group = NULL; 97 char *last_group = NULL;
89 98
90 if (ctx.cfg.enable_index_links) 99 if (ctx.cfg.enable_index_links)
91 columns++; 100 columns++;
92 101
93 ctx.page.title = ctx.cfg.root_title; 102 ctx.page.title = ctx.cfg.root_title;
94 cgit_print_http_headers(&ctx); 103 cgit_print_http_headers(&ctx);
95 cgit_print_docstart(&ctx); 104 cgit_print_docstart(&ctx);
96 cgit_print_pageheader(&ctx); 105 cgit_print_pageheader(&ctx);
97 106
98 if (ctx.cfg.index_header) 107 if (ctx.cfg.index_header)
99 html_include(ctx.cfg.index_header); 108 html_include(ctx.cfg.index_header);
100 109
101 html("<table summary='repository list' class='list nowrap'>"); 110 html("<table summary='repository list' class='list nowrap'>");
102 for (i=0; i<cgit_repolist.count; i++) { 111 for (i=0; i<cgit_repolist.count; i++) {
103 ctx.repo = &cgit_repolist.repos[i]; 112 ctx.repo = &cgit_repolist.repos[i];
104 if (!is_match(ctx.repo)) 113 if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
105 continue; 114 continue;
106 hits++; 115 hits++;
107 if (hits <= ctx.qry.ofs) 116 if (hits <= ctx.qry.ofs)
108 continue; 117 continue;
109 if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) 118 if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
110 continue; 119 continue;
111 if (!header++) 120 if (!header++)
112 print_header(columns); 121 print_header(columns);
113 if ((last_group == NULL && ctx.repo->group != NULL) || 122 if ((last_group == NULL && ctx.repo->group != NULL) ||
114 (last_group != NULL && ctx.repo->group == NULL) || 123 (last_group != NULL && ctx.repo->group == NULL) ||
115 (last_group != NULL && ctx.repo->group != NULL && 124 (last_group != NULL && ctx.repo->group != NULL &&
116 strcmp(ctx.repo->group, last_group))) { 125 strcmp(ctx.repo->group, last_group))) {
117 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", 126 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
118 columns); 127 columns);
119 html_txt(ctx.repo->group); 128 html_txt(ctx.repo->group);
120 html("</td></tr>"); 129 html("</td></tr>");
121 last_group = ctx.repo->group; 130 last_group = ctx.repo->group;
122 } 131 }
123 htmlf("<tr><td class='%s'>", 132 htmlf("<tr><td class='%s'>",
124 ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); 133 ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
125 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); 134 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
126 html_txt(ctx.repo->name); 135 html_txt(ctx.repo->name);
127 html_link_close(); 136 html_link_close();
128 html("</td><td>"); 137 html("</td><td>");
129 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); 138 html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
130 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); 139 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
131 html_link_close(); 140 html_link_close();
132 html("</td><td>"); 141 html("</td><td>");
133 html_txt(ctx.repo->owner); 142 html_txt(ctx.repo->owner);
134 html("</td><td>"); 143 html("</td><td>");
135 print_modtime(ctx.repo); 144 print_modtime(ctx.repo);
136 html("</td>"); 145 html("</td>");
137 if (ctx.cfg.enable_index_links) { 146 if (ctx.cfg.enable_index_links) {
138 html("<td>"); 147 html("<td>");
139 html_link_open(cgit_repourl(ctx.repo->url), 148 html_link_open(cgit_repourl(ctx.repo->url),
140 NULL, "button"); 149 NULL, "button");
141 html("summary</a>"); 150 html("summary</a>");
142 cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 151 cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
143 0, NULL, NULL); 152 0, NULL, NULL);
144 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); 153 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
145 html("</td>"); 154 html("</td>");
146 } 155 }
147 html("</tr>\n"); 156 html("</tr>\n");
148 } 157 }
149 html("</table>"); 158 html("</table>");
150 if (!hits) 159 if (!hits)
151 cgit_print_error("No repositories found"); 160 cgit_print_error("No repositories found");
152 else if (hits > ctx.cfg.max_repo_count) 161 else if (hits > ctx.cfg.max_repo_count)
153 print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); 162 print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
154 cgit_print_docend(); 163 cgit_print_docend();
155} 164}
156 165
157void cgit_print_site_readme() 166void cgit_print_site_readme()
158{ 167{
159 if (ctx.cfg.root_readme) 168 if (ctx.cfg.root_readme)
160 html_include(ctx.cfg.root_readme); 169 html_include(ctx.cfg.root_readme);
161} 170}