summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-04-13 09:57:10 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-13 10:10:03 (UTC)
commit536b0541fcfea2169e4df33043cd9ff14c657bce (patch) (unidiff)
treec27848059cd256541d79b01ab91fa07897a5da7d
parent931fc6d1e4986a4566647dda16af09bf69a28b89 (diff)
downloadcgit-536b0541fcfea2169e4df33043cd9ff14c657bce.zip
cgit-536b0541fcfea2169e4df33043cd9ff14c657bce.tar.gz
cgit-536b0541fcfea2169e4df33043cd9ff14c657bce.tar.bz2
Implement minimal freetext search in the repolist
This makes the repolist much more usable when there's a lot of repositories registered in cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-repolist.c49
-rw-r--r--ui-shared.c11
2 files changed, 47 insertions, 13 deletions
diff --git a/ui-repolist.c b/ui-repolist.c
index 9eba222..a7de453 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -35,55 +35,78 @@ static void print_modtime(struct cgit_repo *repo)
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
47void cgit_print_repolist() 47int is_match(struct cgit_repo *repo)
48{ 48{
49 int i, columns = 4; 49 if (!ctx.qry.search)
50 char *last_group = NULL; 50 return 1;
51 51 if (repo->url && strstr(repo->url, ctx.qry.search))
52 if (ctx.cfg.enable_index_links) 52 return 1;
53 columns++; 53 if (repo->name && strstr(repo->name, ctx.qry.search))
54 54 return 1;
55 ctx.page.title = ctx.cfg.root_title; 55 if (repo->desc && strstr(repo->desc, ctx.qry.search))
56 cgit_print_http_headers(&ctx); 56 return 1;
57 cgit_print_docstart(&ctx); 57 if (repo->owner && strstr(repo->owner, ctx.qry.search))
58 cgit_print_pageheader(&ctx); 58 return 1;
59 return 0;
60}
59 61
60 html("<table summary='repository list' class='list nowrap'>"); 62void print_header(int columns)
63{
61 if (ctx.cfg.index_header) { 64 if (ctx.cfg.index_header) {
62 htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", 65 htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
63 columns); 66 columns);
64 html_include(ctx.cfg.index_header); 67 html_include(ctx.cfg.index_header);
65 html("</td></tr>"); 68 html("</td></tr>");
66 } 69 }
67 html("<tr class='nohover'>" 70 html("<tr class='nohover'>"
68 "<th class='left'>Name</th>" 71 "<th class='left'>Name</th>"
69 "<th class='left'>Description</th>" 72 "<th class='left'>Description</th>"
70 "<th class='left'>Owner</th>" 73 "<th class='left'>Owner</th>"
71 "<th class='left'>Idle</th>"); 74 "<th class='left'>Idle</th>");
72 if (ctx.cfg.enable_index_links) 75 if (ctx.cfg.enable_index_links)
73 html("<th class='left'>Links</th>"); 76 html("<th class='left'>Links</th>");
74 html("</tr>\n"); 77 html("</tr>\n");
78}
75 79
80void cgit_print_repolist()
81{
82 int i, columns = 4, hits = 0, header = 0;
83 char *last_group = NULL;
84
85 if (ctx.cfg.enable_index_links)
86 columns++;
87
88 ctx.page.title = ctx.cfg.root_title;
89 cgit_print_http_headers(&ctx);
90 cgit_print_docstart(&ctx);
91 cgit_print_pageheader(&ctx);
92
93 html("<table summary='repository list' class='list nowrap'>");
76 for (i=0; i<cgit_repolist.count; i++) { 94 for (i=0; i<cgit_repolist.count; i++) {
77 ctx.repo = &cgit_repolist.repos[i]; 95 ctx.repo = &cgit_repolist.repos[i];
96 if (!is_match(ctx.repo))
97 continue;
98 if (!header++)
99 print_header(columns);
100 hits++;
78 if ((last_group == NULL && ctx.repo->group != NULL) || 101 if ((last_group == NULL && ctx.repo->group != NULL) ||
79 (last_group != NULL && ctx.repo->group == NULL) || 102 (last_group != NULL && ctx.repo->group == NULL) ||
80 (last_group != NULL && ctx.repo->group != NULL && 103 (last_group != NULL && ctx.repo->group != NULL &&
81 strcmp(ctx.repo->group, last_group))) { 104 strcmp(ctx.repo->group, last_group))) {
82 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", 105 htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
83 columns); 106 columns);
84 html_txt(ctx.repo->group); 107 html_txt(ctx.repo->group);
85 html("</td></tr>"); 108 html("</td></tr>");
86 last_group = ctx.repo->group; 109 last_group = ctx.repo->group;
87 } 110 }
88 htmlf("<tr><td class='%s'>", 111 htmlf("<tr><td class='%s'>",
89 ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); 112 ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
@@ -101,14 +124,16 @@ void cgit_print_repolist()
101 html("<td>"); 124 html("<td>");
102 html_link_open(cgit_repourl(ctx.repo->url), 125 html_link_open(cgit_repourl(ctx.repo->url),
103 NULL, "button"); 126 NULL, "button");
104 html("summary</a>"); 127 html("summary</a>");
105 cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 128 cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
106 0, NULL, NULL); 129 0, NULL, NULL);
107 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); 130 cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
108 html("</td>"); 131 html("</td>");
109 } 132 }
110 html("</tr>\n"); 133 html("</tr>\n");
111 } 134 }
112 html("</table>"); 135 html("</table>");
136 if (!hits)
137 cgit_print_error("No repositories found");
113 cgit_print_docend(); 138 cgit_print_docend();
114} 139}
diff --git a/ui-shared.c b/ui-shared.c
index 782caa7..6253a90 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -546,33 +546,42 @@ void cgit_print_pageheader(struct cgit_context *ctx)
546 html("</td><td class='form'>"); 546 html("</td><td class='form'>");
547 html("<form class='right' method='get' action='"); 547 html("<form class='right' method='get' action='");
548 if (ctx->cfg.virtual_root) 548 if (ctx->cfg.virtual_root)
549 html_attr(cgit_fileurl(ctx->qry.repo, "log", 549 html_attr(cgit_fileurl(ctx->qry.repo, "log",
550 ctx->qry.path, NULL)); 550 ctx->qry.path, NULL));
551 html("'>\n"); 551 html("'>\n");
552 add_hidden_formfields(1, 0, "log"); 552 add_hidden_formfields(1, 0, "log");
553 html("<select name='qt'>\n"); 553 html("<select name='qt'>\n");
554 html_option("grep", "log msg", ctx->qry.grep); 554 html_option("grep", "log msg", ctx->qry.grep);
555 html_option("author", "author", ctx->qry.grep); 555 html_option("author", "author", ctx->qry.grep);
556 html_option("committer", "committer", ctx->qry.grep); 556 html_option("committer", "committer", ctx->qry.grep);
557 html("</select>\n"); 557 html("</select>\n");
558 html("<input class='txt' type='text' size='8' name='q' value='"); 558 html("<input class='txt' type='text' size='10' name='q' value='");
559 html_attr(ctx->qry.search); 559 html_attr(ctx->qry.search);
560 html("'/>\n"); 560 html("'/>\n");
561 html("<input type='submit' value='search'/>\n"); 561 html("<input type='submit' value='search'/>\n");
562 html("</form>\n"); 562 html("</form>\n");
563 } else { 563 } else {
564 html("<a class='active' href='"); 564 html("<a class='active' href='");
565 html_attr(cgit_rooturl()); 565 html_attr(cgit_rooturl());
566 html("'>index</a>\n"); 566 html("'>index</a>\n");
567 html("</td><td class='form'>");
568 html("<form method='get' action='");
569 html_attr(cgit_rooturl());
570 html("'>\n");
571 html("<input type='text' name='q' size='10' value='");
572 html_attr(ctx->qry.search);
573 html("'/>\n");
574 html("<input type='submit' value='search'/>\n");
575 html("</form>");
567 } 576 }
568 html("</td></tr></table>\n"); 577 html("</td></tr></table>\n");
569 html("<div class='content'>"); 578 html("<div class='content'>");
570} 579}
571 580
572void cgit_print_filemode(unsigned short mode) 581void cgit_print_filemode(unsigned short mode)
573{ 582{
574 if (S_ISDIR(mode)) 583 if (S_ISDIR(mode))
575 html("d"); 584 html("d");
576 else if (S_ISLNK(mode)) 585 else if (S_ISLNK(mode))
577 html("l"); 586 html("l");
578 else if (S_ISGITLINK(mode)) 587 else if (S_ISGITLINK(mode))