From d71c0c725d7b5ddfc5b788d328a5fc7a27739662 Mon Sep 17 00:00:00 2001 From: Benjamin Close Date: Tue, 25 Nov 2008 06:25:35 -0800 Subject: [PATCH] Add support for sorting by Age in the repolist Signed-off-by: Lars Hjemli --- cgit.c | 2 ++ cgit.h | 1 + ui-repolist.c | 39 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/cgit.c b/cgit.c index c82587b..e09c86e 100644 --- a/cgit.c +++ b/cgit.c @@ -154,6 +154,8 @@ static void querystring_cb(const char *name, const char *value) ctx.qry.name = xstrdup(value); } else if (!strcmp(name, "mimetype")) { ctx.qry.mimetype = xstrdup(value); + } else if (!strcmp(name, "s")){ + ctx.qry.sort = xstrdup(value); } } diff --git a/cgit.h b/cgit.h index 91db98a..ea90833 100644 --- a/cgit.h +++ b/cgit.h @@ -121,6 +121,7 @@ struct cgit_query { char *url; int ofs; int nohead; + char *sort; }; struct cgit_config { diff --git a/ui-repolist.c b/ui-repolist.c index c23232c..312a7ee 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -75,7 +75,7 @@ void print_header(int columns) "Name" "Description" "Owner" - "Idle"); + "Idle"); if (ctx.cfg.enable_index_links) html("Links"); html("\n"); @@ -92,6 +92,35 @@ void print_pager(int items, int pagelen, char *search) html(""); } +static int cgit_reposort_modtime(const void *a, const void *b) +{ + const struct cgit_repo *r1 = a; + const struct cgit_repo *r2 = b; + char *path; + struct stat s; + time_t t1, t2; + path = fmt("%s/%s", r1->path, ctx.cfg.agefile); + if (stat(path, &s) == 0) { + t1 = read_agefile(path); + } else { + path = fmt("%s/refs/heads/%s", r1->path, r1->defbranch); + if (stat(path, &s) != 0) + return 0; + t1 =s.st_mtime; + } + + path = fmt("%s/%s", r2->path, ctx.cfg.agefile); + if (stat(path, &s) == 0) { + t2 = read_agefile(path); + } else { + path = fmt("%s/refs/heads/%s", r2->path, r2->defbranch); + if (stat(path, &s) != 0) + return 0; + t2 =s.st_mtime; + } + return t2-t1; +} + void cgit_print_repolist() { int i, columns = 4, hits = 0, header = 0; @@ -108,6 +137,9 @@ void cgit_print_repolist() if (ctx.cfg.index_header) html_include(ctx.cfg.index_header); + if(ctx.qry.sort) + qsort(cgit_repolist.repos,cgit_repolist.count,sizeof(struct cgit_repo),cgit_reposort_modtime); + html(""); for (i=0; igroup != NULL) || + if (!ctx.qry.sort && + ((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))) { + strcmp(ctx.repo->group, last_group)))) { htmlf("
", columns); html_txt(ctx.repo->group);