README: times, they are a-changin

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index a09a6894442ca546b08b55f51f5ec2f3403b4d51..7e7f1fb4105902cfd66b7a31f16a3abc3ca54895 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,6 +1,7 @@
 /* ui-repolist.c: functions for generating the repolist page
  *
  * Copyright (C) 2006 Lars Hjemli
 /* ui-repolist.c: functions for generating the repolist page
  *
  * Copyright (C) 2006 Lars Hjemli

+ * Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -9,6 +10,7 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"

+#include <strings.h>

 
 time_t read_agefile(char *path)
 {
 
 time_t read_agefile(char *path)
 {


@@ -41,11 +43,14 @@ 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);
        path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
        if (stat(path, &s) == 0) {
                *mtime = read_agefile(path);

-               r->mtime = *mtime;
-               return 1;
+               if (*mtime) {
+                       r->mtime = *mtime;
+                       return 1;
+               }

        }
 
        }
 

-       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
+       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;
        if (stat(path, &s) == 0) {
                *mtime = s.st_mtime;
                r->mtime = *mtime;


@@ -120,18 +125,25 @@ void print_header(int columns)
 
 void print_pager(int items, int pagelen, char *search, char *sort)
 {
 
 void print_pager(int items, int pagelen, char *search, char *sort)
 {

-       int i;
+       int i, ofs;
+       char *class = NULL;

        html("<div class='pager'>");
        html("<div class='pager'>");

-       for(i = 0; i * pagelen < items; i++)
-               cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
-                               search, sort, 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("</div>");
 }
 
 static int cmp(const char *s1, const char *s2)
 {
        html("</div>");
 }
 
 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)
        if (s1 && !s2)
                return -1;
        if (s2 && !s1)


@@ -144,10 +156,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;
        const struct cgit_repo *r1 = a;
        const struct cgit_repo *r2 = b;
        int result;

+       time_t t;

 
        result = cmp(r1->section, r2->section);
 
        result = cmp(r1->section, r2->section);

-       if (!result)
-               result = cmp(r1->name, r2->name);
+       if (!result) {
+               if (!strcmp(ctx.cfg.section_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;
 }
 
        return result;
 }