X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/f250c1ca2ea7f35d65f639e42e8b8f0657515e5d..ed5bd30ebe6921dd22948a3f33a314283f043606:/ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 0de328b..76fe71a 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,50 +1,73 @@
 /* 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)
  */
 
-#include <time.h>
-
 #include "cgit.h"
+#include "ui-repolist.h"
 #include "html.h"
 #include "ui-shared.h"
+#include <strings.h>
 
-time_t read_agefile(char *path)
+static 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")))
-		return -1;
-	if (fgets(buf, sizeof(buf), f) == NULL)
+	if (readfile(path, &buf, &size))
 		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)
 {
 	char *path;
 	struct stat s;
+	struct cgit_repo *r = (struct cgit_repo *)repo;
 
+	if (repo->mtime != -1) {
+		*mtime = repo->mtime;
+		return 1;
+	}
 	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);
+	path = fmt("%s/%s", repo->path, "packed-refs");
 	if (stat(path, &s) == 0) {
 		*mtime = s.st_mtime;
+		r->mtime = *mtime;
 		return 1;
 	}
-	return 0;
+
+	*mtime = 0;
+	r->mtime = *mtime;
+	return (r->mtime != 0);
 }
 
 static void print_modtime(struct cgit_repo *repo)
@@ -54,7 +77,7 @@ static void print_modtime(struct cgit_repo *repo)
 		cgit_print_age(t, -1, NULL);
 }
 
-int is_match(struct cgit_repo *repo)
+static int is_match(struct cgit_repo *repo)
 {
 	if (!ctx.qry.search)
 		return 1;
@@ -69,7 +92,7 @@ int is_match(struct cgit_repo *repo)
 	return 0;
 }
 
-int is_in_url(struct cgit_repo *repo)
+static int is_in_url(struct cgit_repo *repo)
 {
 	if (!ctx.qry.url)
 		return 1;
@@ -78,22 +101,23 @@ int is_in_url(struct cgit_repo *repo)
 	return 0;
 }
 
-void print_sort_header(const char *title, const char *sort)
+static 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("&amp;q=");
 		html_url_arg(ctx.qry.search);
 	}
 	htmlf("'>%s</a></th>", title);
 }
 
-void print_header(int columns)
+static void print_header()
 {
 	html("<tr class='nohover'>");
 	print_sort_header("Name", "name");
 	print_sort_header("Description", "desc");
-	print_sort_header("Owner", "owner");
+	if (ctx.cfg.enable_index_owner)
+		print_sort_header("Owner", "owner");
 	print_sort_header("Idle", "idle");
 	if (ctx.cfg.enable_index_links)
 		html("<th class='left'>Links</th>");
@@ -101,27 +125,57 @@ void print_header(int columns)
 }
 
 
-void print_pager(int items, int pagelen, char *search)
+static 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);
-	html("</div>");
+	int i, ofs;
+	char *class = NULL;
+	html("<ul class='pager'>");
+	for (i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
+		class = (ctx.qry.ofs == ofs) ? "current" : NULL;
+		html("<li>");
+		cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
+				class, search, sort, ofs);
+		html("</li>");
+	}
+	html("</ul>");
 }
 
 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)
 		return -1;
+	if (s2 && !s1)
+		return 1;
 	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;
@@ -164,6 +218,7 @@ struct sortcolumn {
 };
 
 struct sortcolumn sortcolumn[] = {
+	{"section", sort_section},
 	{"name", sort_name},
 	{"desc", sort_desc},
 	{"owner", sort_owner},
@@ -171,7 +226,7 @@ struct sortcolumn sortcolumn[] = {
 	{NULL, NULL}
 };
 
-int sort_repolist(char *field)
+static int sort_repolist(char *field)
 {
 	struct sortcolumn *column;
 
@@ -188,12 +243,15 @@ int sort_repolist(char *field)
 
 void cgit_print_repolist()
 {
-	int i, columns = 4, hits = 0, header = 0;
-	char *last_group = NULL;
+	int i, columns = 3, hits = 0, header = 0;
+	char *last_section = NULL;
+	char *section;
 	int sorted = 0;
 
 	if (ctx.cfg.enable_index_links)
-		columns++;
+		++columns;
+	if (ctx.cfg.enable_index_owner)
+		++columns;
 
 	ctx.page.title = ctx.cfg.root_title;
 	cgit_print_http_headers(&ctx);
@@ -203,11 +261,13 @@ void cgit_print_repolist()
 	if (ctx.cfg.index_header)
 		html_include(ctx.cfg.index_header);
 
-	if(ctx.qry.sort)
+	if (ctx.qry.sort)
 		sorted = sort_repolist(ctx.qry.sort);
+	else if (ctx.cfg.section_sort)
+		sort_repolist("section");
 
 	html("<table summary='repository list' class='list nowrap'>");
-	for (i=0; i<cgit_repolist.count; i++) {
+	for (i = 0; i < cgit_repolist.count; i++) {
 		ctx.repo = &cgit_repolist.repos[i];
 		if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
 			continue;
@@ -217,35 +277,40 @@ void cgit_print_repolist()
 		if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
 			continue;
 		if (!header++)
-			print_header(columns);
+			print_header();
+		section = ctx.repo->section;
+		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("<tr class='nohover'><td colspan='%d' class='repogroup'>",
+		    ((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->group);
+			html_txt(section);
 			html("</td></tr>");
-			last_group = ctx.repo->group;
+			last_section = section;
 		}
 		htmlf("<tr><td class='%s'>",
-		      !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("</td><td>");
 		html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
 		html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
 		html_link_close();
 		html("</td><td>");
-		html_txt(ctx.repo->owner);
-		html("</td><td>");
+		if (ctx.cfg.enable_index_owner) {
+			html_txt(ctx.repo->owner);
+			html("</td><td>");
+		}
 		print_modtime(ctx.repo);
 		html("</td>");
 		if (ctx.cfg.enable_index_links) {
 			html("<td>");
 			cgit_summary_link("summary", NULL, "button", NULL);
 			cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
-				      0, NULL, NULL);
+				      0, NULL, NULL, ctx.qry.showmsg);
 			cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
 			html("</td>");
 		}
@@ -255,12 +320,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);
 }