X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/a215bf4620113fcefb8dd3442bf3501bd648c463..1b5c336cc99f01a0f8d6668cbfc9273f49a6be25:/ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index b6cb813..0b1b531 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -6,17 +6,87 @@
  *   (see COPYING for full license text)
  */
 
+#include <ctype.h>
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int header = 0;
 
-static void print_object(const unsigned char *sha1, char *path)
+static void print_text_buffer(const char *name, char *buf, unsigned long size)
+{
+	unsigned long lineno, idx;
+	const char *numberfmt =
+		"<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
+
+	html("<table summary='blob content' class='blob'>\n");
+
+	if (ctx.cfg.enable_tree_linenumbers) {
+		html("<tr><td class='linenumbers'><pre>");
+		idx = 0;
+		lineno = 0;
+	
+		if (size) {
+			htmlf(numberfmt, ++lineno);
+			while(idx < size - 1) { // skip absolute last newline
+				if (buf[idx] == '\n')
+					htmlf(numberfmt, ++lineno);
+				idx++;
+			}
+		}
+		html("</pre></td>\n");
+	}
+	else {
+		html("<tr>\n");
+	}
+
+	if (ctx.repo->source_filter) {
+		html("<td class='lines'><pre><code>");
+		ctx.repo->source_filter->argv[1] = xstrdup(name);
+		cgit_open_filter(ctx.repo->source_filter);
+		html_raw(buf, size);
+		cgit_close_filter(ctx.repo->source_filter);
+		html("</code></pre></td></tr></table>\n");
+		return;
+	}
+
+	html("<td class='lines'><pre><code>");
+	html_txt(buf);
+	html("</code></pre></td></tr></table>\n");
+}
+
+#define ROWLEN 32
+
+static void print_binary_buffer(char *buf, unsigned long size)
+{
+	unsigned long ofs, idx;
+	static char ascii[ROWLEN + 1];
+
+	html("<table summary='blob content' class='bin-blob'>\n");
+	html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
+	for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
+		htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs);
+		for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
+			htmlf("%*s%02x",
+			      idx == 16 ? 4 : 1, "",
+			      buf[idx] & 0xff);
+		html(" </td><td class='hex'>");
+		for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
+			ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.';
+		ascii[idx] = '\0';
+		html_txt(ascii);
+		html("</td></tr>\n");
+	}
+	html("</table>\n");
+}
+
+static void print_object(const unsigned char *sha1, char *path, const char *basename)
 {
 	enum object_type type;
-	unsigned char *buf;
-	unsigned long size, lineno, start, idx;
+	char *buf;
+	unsigned long size;
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD) {
@@ -32,68 +102,81 @@ static void print_object(const unsigned char *sha1, char *path)
 		return;
 	}
 
-	html("<table class='blob'>\n");
-	idx = 0;
-	start = 0;
-	lineno = 0;
-	while(idx < size) {
-		if (buf[idx] == '\n') {
-			buf[idx] = '\0';
-			htmlf("<tr><td class='no'>%d</td><td class='txt'>",
-			      ++lineno);
-			html_txt(buf + start);
-			html("</td></tr>\n");
-			start = idx + 1;
-		}
-		idx++;
+	htmlf("blob: %s (", sha1_to_hex(sha1));
+	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
+		        curr_rev, path);
+	html(")\n");
+
+	if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
+		htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>",
+				size / 1024, ctx.cfg.max_blob_size);
+		return;
 	}
-	html("</table>\n");
+
+	if (buffer_is_binary(buf, size))
+		print_binary_buffer(buf, size);
+	else
+		print_text_buffer(basename, buf, size);
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
-		   const char *pathname, unsigned int mode, int stage)
+		   const char *pathname, unsigned int mode, int stage,
+		   void *cbdata)
 {
 	char *name;
 	char *fullpath;
+	char *class;
 	enum object_type type;
 	unsigned long size = 0;
 
 	name = xstrdup(pathname);
-	fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
-		       cgit_query_path ? "/" : "", name);
+	fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+		       ctx.qry.path ? "/" : "", name);
 
-	type = sha1_object_info(sha1, &size);
-	if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
-		htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
-		      name,
-		      sha1_to_hex(sha1));
-		return 0;
+	if (!S_ISGITLINK(mode)) {
+		type = sha1_object_info(sha1, &size);
+		if (type == OBJ_BAD) {
+			htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+			      name,
+			      sha1_to_hex(sha1));
+			return 0;
+		}
 	}
 
 	html("<tr><td class='ls-mode'>");
-	html_filemode(mode);
+	cgit_print_filemode(mode);
 	html("</td><td>");
-	if (S_ISDIRLNK(mode)) {
+	if (S_ISGITLINK(mode)) {
 		htmlf("<a class='ls-mod' href='");
-		html_attr(fmt(cgit_repo->module_link,
+		html_attr(fmt(ctx.repo->module_link,
 			      name,
 			      sha1_to_hex(sha1)));
 		html("'>");
 		html_txt(name);
 		html("</a>");
 	} else if (S_ISDIR(mode)) {
-		cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
+		cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
 			       curr_rev, fullpath);
 	} else {
-		cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
+		class = strrchr(name, '.');
+		if (class != NULL) {
+			class = fmt("ls-blob %s", class + 1);
+		} else
+			class = "ls-blob";
+		cgit_tree_link(name, NULL, class, ctx.qry.head,
 			       curr_rev, fullpath);
 	}
 	htmlf("</td><td class='ls-size'>%li</td>", size);
 
 	html("<td>");
-	cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
-		      fullpath);
+	cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
+		      fullpath, 0, NULL, NULL, ctx.qry.showmsg);
+	if (ctx.repo->max_stats)
+		cgit_stats_link("stats", NULL, "button", ctx.qry.head,
+				fullpath);
+	cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
+			fullpath);
 	html("</td></tr>\n");
 	free(name);
 	return 0;
@@ -101,7 +184,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
 static void ls_head()
 {
-	html("<table class='list'>\n");
+	html("<table summary='tree listing' class='list'>\n");
 	html("<tr class='nohover'>");
 	html("<th class='left'>Mode</th>");
 	html("<th class='left'>Name</th>");
@@ -131,27 +214,21 @@ static void ls_tree(const unsigned char *sha1, char *path)
 	}
 
 	ls_head();
-	read_tree_recursive(tree, "", 0, 1, NULL, ls_item);
+	read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
 	ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
-		     const char *pathname, unsigned mode, int stage)
+		     const char *pathname, unsigned mode, int stage,
+		     void *cbdata)
 {
 	static int state;
 	static char buffer[PATH_MAX];
-	char *url;
 
 	if (state == 0) {
 		memcpy(buffer, base, baselen);
 		strcpy(buffer+baselen, pathname);
-		url = cgit_pageurl(cgit_query_repo, "tree",
-				   fmt("h=%s&amp;path=%s", curr_rev, buffer));
-		html("/");
-		cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
-			       curr_rev, buffer);
-
 		if (strcmp(match_path, buffer))
 			return READ_TREE_RECURSIVE;
 
@@ -160,11 +237,11 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 			ls_head();
 			return READ_TREE_RECURSIVE;
 		} else {
-			print_object(sha1, buffer);
+			print_object(sha1, buffer, pathname);
 			return 0;
 		}
 	}
-	ls_item(sha1, base, baselen, pathname, mode, stage);
+	ls_item(sha1, base, baselen, pathname, mode, stage, NULL);
 	return 0;
 }
 
@@ -181,7 +258,7 @@ void cgit_print_tree(const char *rev, char *path)
 	const char *paths[] = {path, NULL};
 
 	if (!rev)
-		rev = cgit_query_head;
+		rev = ctx.qry.head;
 
 	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
@@ -194,16 +271,12 @@ void cgit_print_tree(const char *rev, char *path)
 		return;
 	}
 
-	html("path: <a href='");
-	html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev)));
-	html("'>root</a>");
-
 	if (path == NULL) {
 		ls_tree(commit->tree->object.sha1, NULL);
 		return;
 	}
 
 	match_path = path;
-	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree);
+	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
 	ls_tail();
 }