| -rw-r--r-- | ui-tree.c | 55 |
1 files changed, 39 insertions, 16 deletions
@@ -16,5 +16,5 @@ char *match_path; int header = 0; -static void print_text_buffer(char *buf, unsigned long size) +static void print_text_buffer(const char *name, char *buf, unsigned long size) { unsigned long lineno, idx; @@ -23,17 +23,34 @@ static void print_text_buffer(char *buf, unsigned long size) html("<table summary='blob content' class='blob'>\n"); - 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++; + + 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); + write(STDOUT_FILENO, buf, size); + cgit_close_filter(ctx.repo->source_filter); + html("</code></pre></td></tr></table>\n"); + return; } - html("</pre></td>\n"); + html("<td class='lines'><pre><code>"); html_txt(buf); @@ -66,5 +83,5 @@ static void print_binary_buffer(char *buf, unsigned long size) } -static void print_object(const unsigned char *sha1, char *path) +static void print_object(const unsigned char *sha1, char *path, const char *basename) { enum object_type type; @@ -94,5 +111,5 @@ static void print_object(const unsigned char *sha1, char *path) print_binary_buffer(buf, size); else - print_text_buffer(buf, size); + print_text_buffer(basename, buf, size); } @@ -104,4 +121,5 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, char *name; char *fullpath; + char *class; enum object_type type; unsigned long size = 0; @@ -136,5 +154,10 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, curr_rev, fullpath); } else { - cgit_tree_link(name, NULL, "ls-blob", ctx.qry.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); } @@ -214,5 +237,5 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, return READ_TREE_RECURSIVE; } else { - print_object(sha1, buffer); + print_object(sha1, buffer, pathname); return 0; } |