ui-repolist.c: sort by section name, repo name as default

When no sorting is requested by the client, cgit will now sort by
section name followed by repo name. This allows repos to be registered/
discovered independently of their display order.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 4dea3b3..d56654d 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -115,131 +115,146 @@ void print_header(int columns)
 }
 
 
 void print_pager(int items, int pagelen, char *search)
 {
 	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>");
 }
 
 static int cmp(const char *s1, const char *s2)
 {
 	if (s1 && s2)
 		return strcmp(s1, s2);
 	if (s1 && !s2)
 		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;
+
+	result = cmp(r1->section, r2->section);
+	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;
 	const struct cgit_repo *r2 = b;
 
 	return cmp(r1->name, r2->name);
 }
 
 static int sort_desc(const void *a, const void *b)
 {
 	const struct cgit_repo *r1 = a;
 	const struct cgit_repo *r2 = b;
 
 	return cmp(r1->desc, r2->desc);
 }
 
 static int sort_owner(const void *a, const void *b)
 {
 	const struct cgit_repo *r1 = a;
 	const struct cgit_repo *r2 = b;
 
 	return cmp(r1->owner, r2->owner);
 }
 
 static int sort_idle(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;
 }
 
 struct sortcolumn {
 	const char *name;
 	int (*fn)(const void *a, const void *b);
 };
 
 struct sortcolumn sortcolumn[] = {
+	{"section", sort_section},
 	{"name", sort_name},
 	{"desc", sort_desc},
 	{"owner", sort_owner},
 	{"idle", sort_idle},
 	{NULL, NULL}
 };
 
 int sort_repolist(char *field)
 {
 	struct sortcolumn *column;
 
 	for (column = &sortcolumn[0]; column->name; column++) {
 		if (strcmp(field, column->name))
 			continue;
 		qsort(cgit_repolist.repos, cgit_repolist.count,
 			sizeof(struct cgit_repo), column->fn);
 		return 1;
 	}
 	return 0;
 }
 
 
 void cgit_print_repolist()
 {
 	int i, columns = 4, hits = 0, header = 0;
 	char *last_section = NULL;
 	int sorted = 0;
 
 	if (ctx.cfg.enable_index_links)
 		columns++;
 
 	ctx.page.title = ctx.cfg.root_title;
 	cgit_print_http_headers(&ctx);
 	cgit_print_docstart(&ctx);
 	cgit_print_pageheader(&ctx);
 
 	if (ctx.cfg.index_header)
 		html_include(ctx.cfg.index_header);
 
 	if(ctx.qry.sort)
 		sorted = sort_repolist(ctx.qry.sort);
+	else
+		sort_repolist("section");
 
 	html("<table summary='repository list' class='list nowrap'>");
 	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;
 		hits++;
 		if (hits <= ctx.qry.ofs)
 			continue;
 		if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
 			continue;
 		if (!header++)
 			print_header(columns);
 		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)))) {
 			htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
 			      columns);
 			html_txt(ctx.repo->section);
 			html("</td></tr>");
 			last_section = ctx.repo->section;
 		}