X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/7710178e45dee61e85ea77c4221309ce8c086f95..521e10c884055c800078e6dada97ccf6c5193aad:/ui-repolist.c diff --git a/ui-repolist.c b/ui-repolist.c index 2c13d50..36c067a 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -1,35 +1,33 @@ /* ui-repolist.c: functions for generating the repolist page * * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2012 Jason A. Donenfeld * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ -/* This is needed for strcasestr to be defined by */ -#define _GNU_SOURCE 1 -#include - -#include - #include "cgit.h" #include "html.h" #include "ui-shared.h" +#include time_t read_agefile(char *path) { - FILE *f; - static char buf[64], buf2[64]; + time_t result; + size_t size; + char *buf; + static char buf2[64]; - if (!(f = fopen(path, "r"))) + if (readfile(path, &buf, &size)) return -1; - if (fgets(buf, sizeof(buf), f) == NULL) - return -1; - fclose(f); - if (parse_date(buf, buf2, sizeof(buf2))) - return strtoul(buf2, NULL, 10); + + if (parse_date(buf, buf2, sizeof(buf2)) > 0) + result = strtoul(buf2, NULL, 10); else - return 0; + result = 0; + free(buf); + return result; } static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) @@ -45,16 +43,28 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) path = fmt("%s/%s", repo->path, ctx.cfg.agefile); if (stat(path, &s) == 0) { *mtime = read_agefile(path); + if (*mtime) { + r->mtime = *mtime; + return 1; + } + } + + path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ? + repo->defbranch : "master"); + if (stat(path, &s) == 0) { + *mtime = s.st_mtime; r->mtime = *mtime; return 1; } - path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); - if (stat(path, &s) == 0) + path = fmt("%s/%s", repo->path, "packed-refs"); + if (stat(path, &s) == 0) { *mtime = s.st_mtime; - else - *mtime = 0; + r->mtime = *mtime; + return 1; + } + *mtime = 0; r->mtime = *mtime; return (r->mtime != 0); } @@ -92,9 +102,9 @@ int is_in_url(struct cgit_repo *repo) void print_sort_header(const char *title, const char *sort) { - htmlf("%s", title); @@ -113,20 +123,27 @@ void print_header(int columns) } -void print_pager(int items, int pagelen, char *search) +void print_pager(int items, int pagelen, char *search, char *sort) { - int i; + int i, ofs; + char *class = NULL; html("
"); - for(i = 0; i * pagelen < items; i++) - cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, - search, i * pagelen); + for(i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) { + class = (ctx.qry.ofs == ofs) ? "current" : NULL; + cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), class, + search, sort, ofs); + } 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) @@ -134,6 +151,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; @@ -176,6 +214,7 @@ struct sortcolumn { }; struct sortcolumn sortcolumn[] = { + {"section", sort_section}, {"name", sort_name}, {"desc", sort_desc}, {"owner", sort_owner}, @@ -201,7 +240,8 @@ int sort_repolist(char *field) void cgit_print_repolist() { int i, columns = 4, hits = 0, header = 0; - char *last_group = NULL; + char *last_section = NULL; + char *section; int sorted = 0; if (ctx.cfg.enable_index_links) @@ -217,6 +257,8 @@ void cgit_print_repolist() if(ctx.qry.sort) sorted = sort_repolist(ctx.qry.sort); + else + sort_repolist("section"); html(""); for (i=0; isection; + if (section && !strcmp(section, "")) + section = NULL; if (!sorted && - ((last_group == NULL && ctx.repo->group != NULL) || - (last_group != NULL && ctx.repo->group == NULL) || - (last_group != NULL && ctx.repo->group != NULL && - strcmp(ctx.repo->group, last_group)))) { - htmlf(""); - last_group = ctx.repo->group; + last_section = section; } htmlf("
", + ((last_section == NULL && section != NULL) || + (last_section != NULL && section == NULL) || + (last_section != NULL && section != NULL && + strcmp(section, last_section)))) { + htmlf("
", columns); - html_txt(ctx.repo->group); + html_txt(section); html("
", - !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); + !sorted && section ? "sublevel-repo" : "toplevel-repo"); cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); html(""); html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); @@ -267,12 +312,17 @@ void cgit_print_repolist() 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); + print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort); cgit_print_docend(); } void cgit_print_site_readme() { - if (ctx.cfg.root_readme) - html_include(ctx.cfg.root_readme); + if (!ctx.cfg.root_readme) + return; + if (ctx.cfg.about_filter) + cgit_open_filter(ctx.cfg.about_filter); + html_include(ctx.cfg.root_readme); + if (ctx.cfg.about_filter) + cgit_close_filter(ctx.cfg.about_filter); }