X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/1de3048d08fc6491630c45437f88f5ab03c0508f..f7f26f88755ac6a3b9af4918b51b0d6e7a692c78:/ui-repolist.c diff --git a/ui-repolist.c b/ui-repolist.c index a09a689..d4ee279 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -1,16 +1,18 @@ /* ui-repolist.c: functions for generating the repolist page * - * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2006-2014 cgit Development Team * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" +#include "ui-repolist.h" #include "html.h" #include "ui-shared.h" +#include -time_t read_agefile(char *path) +static time_t read_agefile(char *path) { time_t result; size_t size; @@ -30,7 +32,7 @@ time_t read_agefile(char *path) static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) { - char *path; + struct strbuf path = STRBUF_INIT; struct stat s; struct cgit_repo *r = (struct cgit_repo *)repo; @@ -38,29 +40,36 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) *mtime = repo->mtime; return 1; } - path = fmt("%s/%s", repo->path, ctx.cfg.agefile); - if (stat(path, &s) == 0) { - *mtime = read_agefile(path); - r->mtime = *mtime; - return 1; + strbuf_addf(&path, "%s/%s", repo->path, ctx.cfg.agefile); + if (stat(path.buf, &s) == 0) { + *mtime = read_agefile(path.buf); + if (*mtime) { + r->mtime = *mtime; + goto end; + } } - path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); - if (stat(path, &s) == 0) { + strbuf_reset(&path); + strbuf_addf(&path, "%s/refs/heads/%s", repo->path, + repo->defbranch ? repo->defbranch : "master"); + if (stat(path.buf, &s) == 0) { *mtime = s.st_mtime; r->mtime = *mtime; - return 1; + goto end; } - path = fmt("%s/%s", repo->path, "packed-refs"); - if (stat(path, &s) == 0) { + strbuf_reset(&path); + strbuf_addf(&path, "%s/%s", repo->path, "packed-refs"); + if (stat(path.buf, &s) == 0) { *mtime = s.st_mtime; r->mtime = *mtime; - return 1; + goto end; } *mtime = 0; r->mtime = *mtime; +end: + strbuf_release(&path); return (r->mtime != 0); } @@ -71,7 +80,7 @@ static void print_modtime(struct cgit_repo *repo) cgit_print_age(t, -1, NULL); } -int is_match(struct cgit_repo *repo) +static int is_match(struct cgit_repo *repo) { if (!ctx.qry.search) return 1; @@ -86,7 +95,7 @@ int is_match(struct cgit_repo *repo) return 0; } -int is_in_url(struct cgit_repo *repo) +static int is_in_url(struct cgit_repo *repo) { if (!ctx.qry.url) return 1; @@ -95,22 +104,23 @@ int is_in_url(struct cgit_repo *repo) return 0; } -void print_sort_header(const char *title, const char *sort) +static void print_sort_header(const char *title, const char *sort) { htmlf("%s", title); } -void print_header(int columns) +static void print_header() { html(""); print_sort_header("Name", "name"); print_sort_header("Description", "desc"); - print_sort_header("Owner", "owner"); + if (ctx.cfg.enable_index_owner) + print_sort_header("Owner", "owner"); print_sort_header("Idle", "idle"); if (ctx.cfg.enable_index_links) html("Links"); @@ -118,20 +128,29 @@ void print_header(int columns) } -void print_pager(int items, int pagelen, char *search, char *sort) +static void print_pager(int items, int pagelen, char *search, char *sort) { - int i; - html("
"); - for(i = 0; i * pagelen < items; i++) - cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, - search, sort, i * pagelen); - html("
"); + int i, ofs; + char *class = NULL; + html(""); } static int cmp(const char *s1, const char *s2) { - if (s1 && s2) - return strcmp(s1, s2); + if (s1 && s2) { + if (ctx.cfg.case_sensitive_sort) + return strcmp(s1, s2); + else + return strcasecmp(s1, s2); + } if (s1 && !s2) return -1; if (s2 && !s1) @@ -144,10 +163,19 @@ 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) - result = cmp(r1->name, r2->name); + 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; } @@ -201,7 +229,7 @@ struct sortcolumn sortcolumn[] = { {NULL, NULL} }; -int sort_repolist(char *field) +static int sort_repolist(char *field) { struct sortcolumn *column; @@ -218,13 +246,15 @@ int sort_repolist(char *field) void cgit_print_repolist() { - int i, columns = 4, hits = 0, header = 0; + int i, columns = 3, hits = 0, header = 0; char *last_section = NULL; char *section; int sorted = 0; if (ctx.cfg.enable_index_links) - columns++; + ++columns; + if (ctx.cfg.enable_index_owner) + ++columns; ctx.page.title = ctx.cfg.root_title; cgit_print_http_headers(&ctx); @@ -234,13 +264,13 @@ void cgit_print_repolist() if (ctx.cfg.index_header) html_include(ctx.cfg.index_header); - if(ctx.qry.sort) + if (ctx.qry.sort) sorted = sort_repolist(ctx.qry.sort); - else + else if (ctx.cfg.section_sort) sort_repolist("section"); html(""); - for (i=0; i ctx.qry.ofs + ctx.cfg.max_repo_count) continue; if (!header++) - print_header(columns); + print_header(); section = ctx.repo->section; if (section && !strcmp(section, "")) section = NULL; @@ -273,8 +303,10 @@ void cgit_print_repolist() html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); html_link_close(); html(""); if (ctx.cfg.enable_index_links) { @@ -299,9 +331,13 @@ void cgit_print_site_readme() { if (!ctx.cfg.root_readme) return; - if (ctx.cfg.about_filter) + if (ctx.cfg.about_filter) { + ctx.cfg.about_filter->argv[1] = ctx.cfg.root_readme; cgit_open_filter(ctx.cfg.about_filter); + } html_include(ctx.cfg.root_readme); - if (ctx.cfg.about_filter) + if (ctx.cfg.about_filter) { cgit_close_filter(ctx.cfg.about_filter); + ctx.cfg.about_filter->argv[1] = NULL; + } }
"); - html_txt(ctx.repo->owner); - html(""); + if (ctx.cfg.enable_index_owner) { + html_txt(ctx.repo->owner); + html(""); + } print_modtime(ctx.repo); html("