Diffstat (limited to 'ui-repolist.c')
| -rw-r--r-- | ui-repolist.c | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/ui-repolist.c b/ui-repolist.c index 6004469..1b224cf 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -11,16 +11,16 @@ #include "html.h" #include "ui-shared.h" -static time_t read_agefile(char *path) +static time_t read_agefile(const char *path) { time_t result; size_t size; char *buf = NULL; struct strbuf date_buf = STRBUF_INIT; - if (readfile(path, &buf, &size)) { + if (read_first_line(path, &buf, &size)) { free(buf); - return -1; + return 0; } if (parse_date(buf, &date_buf) == 0) @@ -79,7 +79,7 @@ static void print_modtime(struct cgit_repo *repo) { time_t t; if (get_repo_modtime(repo, &t)) - cgit_print_age(t, -1); + cgit_print_age(t, 0, -1); } static int is_match(struct cgit_repo *repo) @@ -184,27 +184,6 @@ 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; @@ -241,6 +220,22 @@ 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); @@ -275,6 +270,7 @@ 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()) { @@ -292,9 +288,6 @@ 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) @@ -320,7 +313,7 @@ void cgit_print_repolist(void) (last_section != NULL && section == NULL) || (last_section != NULL && section != NULL && strcmp(section, last_section)))) { - htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>", + htmlf("<tr class='nohover-highlight'><td colspan='%d' class='reposection'>", columns); html_txt(section); html("</td></tr>"); @@ -328,10 +321,13 @@ void cgit_print_repolist(void) } htmlf("<tr><td class='%s'>", !sorted && section ? "sublevel-repo" : "toplevel-repo"); - cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); + cgit_summary_link(ctx.repo->name, NULL, NULL, NULL); html("</td><td>"); - html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); - html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); + 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_close(); html("</td><td>"); if (ctx.cfg.enable_index_owner) { @@ -340,13 +336,15 @@ 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(cgit_currenturl()); + html_attr(currenturl); html("?q="); html_url_arg(ctx.repo->owner); html("'>"); html_txt(ctx.repo->owner); html("</a>"); + free(currenturl); } html("</td><td>"); } |