Merge branch 'lh/about'

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 79332fc9eb22cc83bf4a098abcaf32102862b4d1..c608754f3e8e930169fda2ad08b7aba00a07cdb1 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -6,6 +6,7 @@
  *   (see COPYING for full license text)
  */
 
+#include <ctype.h>
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
@@ -14,12 +15,71 @@ 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.repo->source_filter) {
+               html("<tr><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("<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");
+       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'>%04x</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;
        char *buf;
-       unsigned long size, lineno, start, idx;
-       const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
+       unsigned long size;
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
@@ -38,26 +98,12 @@ static void print_object(const unsigned char *sha1, char *path)
        html(" (");
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        curr_rev, path);
-       htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
+       htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
 
-       html("<table summary='blob content' class='blob'>\n");
-       idx = 0;
-       start = 0;
-       lineno = 0;
-       while(idx < size) {
-               if (buf[idx] == '\n') {
-                       buf[idx] = '\0';
-                       htmlf(linefmt, ++lineno);
-                       html_txt(buf + start);
-                       html("</td></tr>\n");
-                       start = idx + 1;
-               }
-               idx++;
-       }
-       htmlf(linefmt, ++lineno);
-       html_txt(buf + start);
-       html("</td></tr>\n");
-       html("</table>\n");
+       if (buffer_is_binary(buf, size))
+               print_binary_buffer(buf, size);
+       else
+               print_text_buffer(basename, buf, size);
 }
 
 
@@ -67,6 +113,7 @@ 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;
 
@@ -99,14 +146,22 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                               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);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
-                     fullpath, 0, NULL, NULL);
+                     fullpath, 0, NULL, NULL, ctx.qry.showmsg);
+       if (ctx.repo->max_stats)
+               cgit_stats_link("stats", NULL, "button", ctx.qry.head,
+                               fullpath);
        html("</td></tr>\n");
        free(name);
        return 0;
@@ -174,7 +229,7 @@ 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;
                }
        }