aboutsummaryrefslogtreecommitdiff
path: root/ui-repolist.c
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'ui-repolist.c')
-rw-r--r--ui-repolist.c113
1 files changed, 44 insertions, 69 deletions
diff --git a/ui-repolist.c b/ui-repolist.c
index 1b224cf..2453a7f 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -10,18 +10,17 @@
#include "ui-repolist.h"
#include "html.h"
#include "ui-shared.h"
+#include <strings.h>
-static time_t read_agefile(const char *path)
+static time_t read_agefile(char *path)
{
time_t result;
size_t size;
- char *buf = NULL;
+ char *buf;
struct strbuf date_buf = STRBUF_INIT;
- if (read_first_line(path, &buf, &size)) {
- free(buf);
- return 0;
- }
+ if (readfile(path, &buf, &size))
+ return -1;
if (parse_date(buf, &date_buf) == 0)
result = strtoul(date_buf.buf, NULL, 10);
@@ -79,7 +78,7 @@ static void print_modtime(struct cgit_repo *repo)
{
time_t t;
if (get_repo_modtime(repo, &t))
- cgit_print_age(t, 0, -1);
+ cgit_print_age(t, -1, NULL);
}
static int is_match(struct cgit_repo *repo)
@@ -106,38 +105,16 @@ static int is_in_url(struct cgit_repo *repo)
return 0;
}
-static int is_visible(struct cgit_repo *repo)
-{
- if (repo->hide || repo->ignore)
- return 0;
- if (!(is_match(repo) && is_in_url(repo)))
- return 0;
- return 1;
-}
-
-static int any_repos_visible(void)
-{
- int i;
-
- for (i = 0; i < cgit_repolist.count; i++) {
- if (is_visible(&cgit_repolist.repos[i]))
- return 1;
- }
- return 0;
-}
-
static void print_sort_header(const char *title, const char *sort)
{
- char *currenturl = cgit_currenturl();
html("<th class='left'><a href='");
- html_attr(currenturl);
+ html_attr(cgit_currenturl());
htmlf("?s=%s", sort);
if (ctx.qry.search) {
html("&amp;q=");
html_url_arg(ctx.qry.search);
}
htmlf("'>%s</a></th>", title);
- free(currenturl);
}
static void print_header(void)
@@ -184,6 +161,27 @@ static int cmp(const char *s1, const char *s2)
return 0;
}
+static int sort_section(const void *a, const void *b)
+{
+ const struct cgit_repo *r1 = a;
+ const struct cgit_repo *r2 = b;
+ int result;
+ time_t t;
+
+ result = cmp(r1->section, r2->section);
+ if (!result) {
+ if (!strcmp(ctx.cfg.repository_sort, "age")) {
+ // get_repo_modtime caches the value in r->mtime, so we don't
+ // have to worry about inefficiencies here.
+ if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t))
+ result = r2->mtime - r1->mtime;
+ }
+ if (!result)
+ result = cmp(r1->name, r2->name);
+ }
+ return result;
+}
+
static int sort_name(const void *a, const void *b)
{
const struct cgit_repo *r1 = a;
@@ -220,22 +218,6 @@ static int sort_idle(const void *a, const void *b)
return t2 - t1;
}
-static int sort_section(const void *a, const void *b)
-{
- const struct cgit_repo *r1 = a;
- const struct cgit_repo *r2 = b;
- int result;
-
- result = cmp(r1->section, r2->section);
- if (!result) {
- if (!strcmp(ctx.cfg.repository_sort, "age"))
- result = sort_idle(r1, r2);
- if (!result)
- result = cmp(r1->name, r2->name);
- }
- return result;
-}
-
struct sortcolumn {
const char *name;
int (*fn)(const void *a, const void *b);
@@ -270,14 +252,8 @@ void cgit_print_repolist(void)
int i, columns = 3, hits = 0, header = 0;
char *last_section = NULL;
char *section;
- char *repourl;
int sorted = 0;
- if (!any_repos_visible()) {
- cgit_print_error_page(404, "Not found", "No repositories found");
- return;
- }
-
if (ctx.cfg.enable_index_links)
++columns;
if (ctx.cfg.enable_index_owner)
@@ -288,6 +264,9 @@ void cgit_print_repolist(void)
cgit_print_docstart();
cgit_print_pageheader();
+ if (ctx.cfg.index_header)
+ html_include(ctx.cfg.index_header);
+
if (ctx.qry.sort)
sorted = sort_repolist(ctx.qry.sort);
else if (ctx.cfg.section_sort)
@@ -296,7 +275,9 @@ void cgit_print_repolist(void)
html("<table summary='repository list' class='list nowrap'>");
for (i = 0; i < cgit_repolist.count; i++) {
ctx.repo = &cgit_repolist.repos[i];
- if (!is_visible(ctx.repo))
+ if (ctx.repo->hide || ctx.repo->ignore)
+ continue;
+ if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
continue;
hits++;
if (hits <= ctx.qry.ofs)
@@ -313,7 +294,7 @@ void cgit_print_repolist(void)
(last_section != NULL && section == NULL) ||
(last_section != NULL && section != NULL &&
strcmp(section, last_section)))) {
- htmlf("<tr class='nohover-highlight'><td colspan='%d' class='reposection'>",
+ htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
columns);
html_txt(section);
html("</td></tr>");
@@ -321,13 +302,10 @@ void cgit_print_repolist(void)
}
htmlf("<tr><td class='%s'>",
!sorted && section ? "sublevel-repo" : "toplevel-repo");
- cgit_summary_link(ctx.repo->name, NULL, NULL, NULL);
+ cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
html("</td><td>");
- repourl = cgit_repourl(ctx.repo->url);
- html_link_open(repourl, NULL, NULL);
- free(repourl);
- if (html_ntxt(ctx.repo->desc, ctx.cfg.max_repodesc_len) < 0)
- html("...");
+ html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
+ html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
html_link_close();
html("</td><td>");
if (ctx.cfg.enable_index_owner) {
@@ -336,15 +314,13 @@ void cgit_print_repolist(void)
html_txt(ctx.repo->owner);
cgit_close_filter(ctx.repo->owner_filter);
} else {
- char *currenturl = cgit_currenturl();
html("<a href='");
- html_attr(currenturl);
+ html_attr(cgit_currenturl());
html("?q=");
html_url_arg(ctx.repo->owner);
html("'>");
html_txt(ctx.repo->owner);
html("</a>");
- free(currenturl);
}
html("</td><td>");
}
@@ -354,26 +330,25 @@ void cgit_print_repolist(void)
html("<td>");
cgit_summary_link("summary", NULL, "button", NULL);
cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
- 0, NULL, NULL, ctx.qry.showmsg, 0);
+ 0, NULL, NULL, ctx.qry.showmsg);
cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
html("</td>");
}
html("</tr>\n");
}
html("</table>");
- if (hits > ctx.cfg.max_repo_count)
+ if (!hits)
+ cgit_print_error("No repositories found");
+ else if (hits > ctx.cfg.max_repo_count)
print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
cgit_print_docend();
}
void cgit_print_site_readme(void)
{
- cgit_print_layout_start();
if (!ctx.cfg.root_readme)
- goto done;
+ return;
cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme);
html_include(ctx.cfg.root_readme);
cgit_close_filter(ctx.cfg.about_filter);
-done:
- cgit_print_layout_end();
}
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 19:53:28 +0000