X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/cbac02c8b056e47b3e0092949c480c7ec64a3e0f..a61871a18ffa9fc28e7ab0950415404350c8c857:/ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 436a774..2c13d50 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,6 +6,10 @@
  *   (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"
@@ -32,19 +36,27 @@ 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);
+		r->mtime = *mtime;
 		return 1;
 	}
 
 	path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-	if (stat(path, &s) == 0) {
+	if (stat(path, &s) == 0)
 		*mtime = s.st_mtime;
-		return 1;
-	}
-	return 0;
+	else
+		*mtime = 0;
+
+	r->mtime = *mtime;
+	return (r->mtime != 0);
 }
 
 static void print_modtime(struct cgit_repo *repo)
@@ -78,13 +90,23 @@ int is_in_url(struct cgit_repo *repo)
 	return 0;
 }
 
+void print_sort_header(const char *title, const char *sort)
+{
+	htmlf("<th class='left'><a href='./?s=%s", sort);
+	if (ctx.qry.search) {
+		html("&q=");
+		html_url_arg(ctx.qry.search);
+	}
+	htmlf("'>%s</a></th>", title);
+}
+
 void print_header(int columns)
 {
-	html("<tr class='nohover'>"
-	     "<th class='left'>Name</th>"
-	     "<th class='left'>Description</th>"
-	     "<th class='left'>Owner</th>"
-	     "<th class='left'><a href=\"?s=1\">Idle</a></th>");
+	html("<tr class='nohover'>");
+	print_sort_header("Name", "name");
+	print_sort_header("Description", "desc");
+	print_sort_header("Owner", "owner");
+	print_sort_header("Idle", "idle");
 	if (ctx.cfg.enable_index_links)
 		html("<th class='left'>Links</th>");
 	html("</tr>\n");
@@ -101,7 +123,42 @@ void print_pager(int items, int pagelen, char *search)
 	html("</div>");
 }
 
-static int cgit_reposort_modtime(const void *a, const void *b)
+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_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;
@@ -113,10 +170,39 @@ static int cgit_reposort_modtime(const void *a, const void *b)
 	return t2 - t1;
 }
 
+struct sortcolumn {
+	const char *name;
+	int (*fn)(const void *a, const void *b);
+};
+
+struct sortcolumn sortcolumn[] = {
+	{"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_group = NULL;
+	int sorted = 0;
 
 	if (ctx.cfg.enable_index_links)
 		columns++;
@@ -130,7 +216,7 @@ void cgit_print_repolist()
 		html_include(ctx.cfg.index_header);
 
 	if(ctx.qry.sort)
-		qsort(cgit_repolist.repos,cgit_repolist.count,sizeof(struct cgit_repo),cgit_reposort_modtime);
+		sorted = sort_repolist(ctx.qry.sort);
 
 	html("<table summary='repository list' class='list nowrap'>");
 	for (i=0; i<cgit_repolist.count; i++) {
@@ -144,7 +230,7 @@ void cgit_print_repolist()
 			continue;
 		if (!header++)
 			print_header(columns);
-		if (!ctx.qry.sort &&
+		if (!sorted &&
 		    ((last_group == NULL && ctx.repo->group != NULL) ||
 		    (last_group != NULL && ctx.repo->group == NULL) ||
 		    (last_group != NULL && ctx.repo->group != NULL &&
@@ -156,7 +242,7 @@ void cgit_print_repolist()
 			last_group = ctx.repo->group;
 		}
 		htmlf("<tr><td class='%s'>",
-		      ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
+		      !sorted && ctx.repo->group ? "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);
@@ -171,7 +257,7 @@ void cgit_print_repolist()
 			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>");
 		}