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
@@ -46,32 +46,41 @@ static void print_modtime(struct cgit_repo *repo)
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;
@@ -88,33 +97,33 @@ void cgit_print_repolist()
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>");