ui-repolist: extract get_repo_modtime() from print_modtime()

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index ab050c788af1ca58564f9dd70c7ebc984feadabb..436a77432458a2613f6bf2b330b8ae28310d2e9b 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -19,7 +19,8 @@ time_t read_agefile(char *path)
 
        if (!(f = fopen(path, "r")))
                return -1;
-       fgets(buf, sizeof(buf), f);
+       if (fgets(buf, sizeof(buf), f) == NULL)
+               return -1;
        fclose(f);
        if (parse_date(buf, buf2, sizeof(buf2)))
                return strtoul(buf2, NULL, 10);
@@ -27,21 +28,30 @@ time_t read_agefile(char *path)
                return 0;
 }
 
-static void print_modtime(struct cgit_repo *repo)
+static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {
        char *path;
        struct stat s;
 
        path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
        if (stat(path, &s) == 0) {
-               cgit_print_age(read_agefile(path), -1, NULL);
-               return;
+               *mtime = read_agefile(path);
+               return 1;
        }
 
        path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-       if (stat(path, &s) != 0)
-               return;
-       cgit_print_age(s.st_mtime, -1, NULL);
+       if (stat(path, &s) == 0) {
+               *mtime = s.st_mtime;
+               return 1;
+       }
+       return 0;
+}
+
+static void print_modtime(struct cgit_repo *repo)
+{
+       time_t t;
+       if (get_repo_modtime(repo, &t))
+               cgit_print_age(t, -1, NULL);
 }
 
 int is_match(struct cgit_repo *repo)
@@ -74,7 +84,7 @@ void print_header(int columns)
             "<th class='left'>Name</th>"
             "<th class='left'>Description</th>"
             "<th class='left'>Owner</th>"
-            "<th class='left'>Idle</th>");
+            "<th class='left'><a href=\"?s=1\">Idle</a></th>");
        if (ctx.cfg.enable_index_links)
                html("<th class='left'>Links</th>");
        html("</tr>\n");
@@ -91,6 +101,18 @@ void print_pager(int items, int pagelen, char *search)
        html("</div>");
 }
 
+static int cgit_reposort_modtime(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+       time_t t1, t2;
+
+       t1 = t2 = 0;
+       get_repo_modtime(r1, &t1);
+       get_repo_modtime(r2, &t2);
+       return t2 - t1;
+}
+
 void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;
@@ -107,6 +129,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("<table summary='repository list' class='list nowrap'>");
        for (i=0; i<cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];
@@ -119,10 +144,11 @@ void cgit_print_repolist()
                        continue;
                if (!header++)
                        print_header(columns);
-               if ((last_group == NULL && ctx.repo->group != 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("<tr class='nohover'><td colspan='%d' class='repogroup'>",
                              columns);
                        html_txt(ctx.repo->group);