X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/66cacd053ba900c8eb3b7962027370c84a97f990..1a6025b7a515a23ab4c83f4a5da468e00e4f0a38:/ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 42f4300..de8a180 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,33 +8,32 @@
 
 #include "cgit.h"
 
+static int header;
+
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 				int flags, void *cb_data)
 {
 	struct commit *commit;
 	struct commitinfo *info;
-	char buf[256], *url;
+	char buf[256];
+	char *ref;
 
+	ref = xstrdup(refname);
 	strncpy(buf, refname, sizeof(buf));
 	commit = lookup_commit(sha1);
+	// object is not really parsed at this point, because of some fallout
+	// from previous calls to git functions in cgit_print_log()
+	commit->object.parsed = 0;
 	if (commit && !parse_commit(commit)){
 		info = cgit_parse_commit(commit);
 		html("<tr><td>");
-		url = cgit_pageurl(cgit_query_repo, "log", 
-				   fmt("h=%s", refname));
-		html_link_open(url, NULL, NULL);
-		html_txt(buf);
-		html_link_close();
+		cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0);
 		html("</td><td>");
-		cgit_print_date(commit->date);
+		cgit_print_age(commit->date, -1, NULL);
 		html("</td><td>");
 		html_txt(info->author);
 		html("</td><td>");
-		url = cgit_pageurl(cgit_query_repo, "commit", 
-				   fmt("id=%s", sha1_to_hex(sha1)));
-		html_link_open(url, NULL, NULL);
-		html_ntxt(cgit_max_msg_len, info->subject);
-		html_link_close();
+		cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
 		html("</td></tr>\n");
 		cgit_free_commitinfo(info);
 	} else {
@@ -44,27 +43,17 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 		htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
 		html("</td></tr>\n");
 	}
+	free(ref);
 	return 0;
 }
 
-
-static void cgit_print_object_ref(struct object *obj)
+static void print_tag_header()
 {
-	char *page, *url;
-
-	if (obj->type == OBJ_COMMIT)
-		page = "commit";
-	else if (obj->type == OBJ_TREE)
-		page = "tree";
-	else
-		page = "view";
-
-	url = cgit_pageurl(cgit_query_repo, page, 
-			   fmt("id=%s", sha1_to_hex(obj->sha1)));
-	html_link_open(url, NULL, NULL);
-	htmlf("%s %s", type_names[obj->type], 
-	      sha1_to_hex(obj->sha1));
-	html_link_close();
+	html("<tr class='nohover'><th class='left'>Tag</th>"
+	     "<th class='left'>Age</th>"
+	     "<th class='left'>Author</th>"
+	     "<th class='left'>Reference</th></tr>\n");
+	header = 1;
 }
 
 static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
@@ -74,7 +63,7 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
 	struct taginfo *info;
 	struct object *obj;
 	char buf[256], *url;
- 
+
 	strncpy(buf, refname, sizeof(buf));
 	obj = parse_object(sha1);
 	if (!obj)
@@ -83,35 +72,80 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
 		tag = lookup_tag(sha1);
 		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
 			return 2;
+		if (!header)
+			print_tag_header();
 		html("<tr><td>");
-		url = cgit_pageurl(cgit_query_repo, "view", 
-				   fmt("id=%s", sha1_to_hex(sha1)));
+		url = cgit_pageurl(cgit_query_repo, "tag",
+				   fmt("id=%s", refname));
 		html_link_open(url, NULL, NULL);
 		html_txt(buf);
 		html_link_close();
 		html("</td><td>");
 		if (info->tagger_date > 0)
-			cgit_print_date(info->tagger_date);
+			cgit_print_age(info->tagger_date, -1, NULL);
 		html("</td><td>");
 		if (info->tagger)
 			html(info->tagger);
 		html("</td><td>");
-		cgit_print_object_ref(tag->tagged);
+		cgit_object_link(tag->tagged);
 		html("</td></tr>\n");
 	} else {
+		if (!header)
+			print_tag_header();
 		html("<tr><td>");
 		html_txt(buf);
 		html("</td><td colspan='2'/><td>");
-		cgit_print_object_ref(obj);
+		cgit_object_link(obj);
 		html("</td></tr>\n");
 	}
 	return 0;
 }
 
+static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
+				 int flags, void *cb_data)
+{
+	struct tag *tag;
+	struct taginfo *info;
+	struct object *obj;
+	char buf[256], *url;
+	unsigned char fileid[20];
+
+	if (prefixcmp(refname, "refs/archives"))
+		return 0;
+	strncpy(buf, refname+14, sizeof(buf));
+	obj = parse_object(sha1);
+	if (!obj)
+		return 1;
+	if (obj->type == OBJ_TAG) {
+		tag = lookup_tag(sha1);
+		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
+			return 0;
+		hashcpy(fileid, tag->tagged->sha1);
+	} else if (obj->type != OBJ_BLOB) {
+		return 0;
+	} else {
+		hashcpy(fileid, sha1);
+	}
+	if (!header) {
+		html("<table id='downloads'>");
+		html("<tr><th>Downloads</th></tr>");
+		header = 1;
+	}
+	html("<tr><td>");
+	url = cgit_pageurl(cgit_query_repo, "blob",
+			   fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
+			       buf));
+	html_link_open(url, NULL, NULL);
+	html_txt(buf);
+	html_link_close();
+	html("</td></tr>");
+	return 0;
+}
+
 static void cgit_print_branches()
 {
 	html("<tr class='nohover'><th class='left'>Branch</th>"
-	     "<th class='left'>Updated</th>"
+	     "<th class='left'>Idle</th>"
 	     "<th class='left'>Author</th>"
 	     "<th class='left'>Head commit</th></tr>\n");
 	for_each_branch_ref(cgit_print_branch_cb, NULL);
@@ -119,21 +153,35 @@ static void cgit_print_branches()
 
 static void cgit_print_tags()
 {
-	html("<tr class='nohover'><th class='left'>Tag</th>"
-	     "<th class='left'>Created</th>"
-	     "<th class='left'>Author</th>"
-	     "<th class='left'>Reference</th></tr>\n");
+	header = 0;
 	for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
+static void cgit_print_archives()
+{
+	header = 0;
+	for_each_ref(cgit_print_archive_cb, NULL);
+	if (header)
+		html("</table>");
+}
+
 void cgit_print_summary()
 {
+	html("<div id='summary'>");
+	cgit_print_archives();
 	html("<h2>");
-	html(cgit_repo->name);
-	html("</h2><h3>");
-	html(cgit_repo->desc);
-	html("</h3>");
+	html_txt(cgit_repo->name);
+	html(" - ");
+	html_txt(cgit_repo->desc);
+	html("</h2>");
+	if (cgit_repo->readme)
+		html_include(cgit_repo->readme);
+	html("</div>");
+	if (cgit_summary_log > 0)
+		cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
 	html("<table class='list nowrap'>");
+	if (cgit_summary_log > 0)
+		html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
 	cgit_print_branches();
 	html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
 	cgit_print_tags();