X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/63816ec59748c622623f20e653a7bed87f4f05a4..61d4147ea2d58c9d129a084be13ccec6ae18b4d5:/ui-repolist.c?ds=sidebyside

diff --git a/ui-repolist.c b/ui-repolist.c
index d56654d..943eaab 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,20 +1,16 @@
 /* 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)
  */
 
-/* This is needed for strcasestr to be defined by <string.h> */
-#define _GNU_SOURCE 1
-#include <string.h>
-
-#include <time.h>
-
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include <strings.h>
 
 time_t read_agefile(char *path)
 {
@@ -26,7 +22,7 @@ time_t read_agefile(char *path)
 	if (readfile(path, &buf, &size))
 		return -1;
 
-	if (parse_date(buf, buf2, sizeof(buf2)))
+	if (parse_date(buf, buf2, sizeof(buf2)) > 0)
 		result = strtoul(buf2, NULL, 10);
 	else
 		result = 0;
@@ -51,12 +47,22 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 		return 1;
 	}
 
-	path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-	if (stat(path, &s) == 0)
+	path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
+		   repo->defbranch : "master");
+	if (stat(path, &s) == 0) {
 		*mtime = s.st_mtime;
-	else
-		*mtime = 0;
+		r->mtime = *mtime;
+		return 1;
+	}
 
+	path = fmt("%s/%s", repo->path, "packed-refs");
+	if (stat(path, &s) == 0) {
+		*mtime = s.st_mtime;
+		r->mtime = *mtime;
+		return 1;
+	}
+
+	*mtime = 0;
 	r->mtime = *mtime;
 	return (r->mtime != 0);
 }
@@ -94,7 +100,7 @@ int is_in_url(struct cgit_repo *repo)
 
 void print_sort_header(const char *title, const char *sort)
 {
-	htmlf("<th class='left'><a href='./?s=%s", sort);
+	htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
 	if (ctx.qry.search) {
 		html("&q=");
 		html_url_arg(ctx.qry.search);
@@ -115,20 +121,24 @@ 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;
 	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, i * pagelen);
+				search, sort, i * pagelen);
 	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)
@@ -141,10 +151,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.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;
 }
 
@@ -217,6 +236,7 @@ void cgit_print_repolist()
 {
 	int i, columns = 4, hits = 0, header = 0;
 	char *last_section = NULL;
+	char *section;
 	int sorted = 0;
 
 	if (ctx.cfg.enable_index_links)
@@ -247,19 +267,22 @@ void cgit_print_repolist()
 			continue;
 		if (!header++)
 			print_header(columns);
+		section = ctx.repo->section;
+		if (section && !strcmp(section, ""))
+			section = NULL;
 		if (!sorted &&
-		    ((last_section == NULL && ctx.repo->section != NULL) ||
-		    (last_section != NULL && ctx.repo->section == NULL) ||
-		    (last_section != NULL && ctx.repo->section != NULL &&
-		     strcmp(ctx.repo->section, last_section)))) {
+		    ((last_section == NULL && section != NULL) ||
+		    (last_section != NULL && section == NULL) ||
+		    (last_section != NULL && section != NULL &&
+		     strcmp(section, last_section)))) {
 			htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
 			      columns);
-			html_txt(ctx.repo->section);
+			html_txt(section);
 			html("</td></tr>");
-			last_section = ctx.repo->section;
+			last_section = section;
 		}
 		htmlf("<tr><td class='%s'>",
-		      !sorted && ctx.repo->section ? "sublevel-repo" : "toplevel-repo");
+		      !sorted && section ? "sublevel-repo" : "toplevel-repo");
 		cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
 		html("</td><td>");
 		html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
@@ -284,7 +307,7 @@ 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();
 }