Merge branch 'stable'

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 553dbaa5a27e60ebad594d23cc842895bdf4beed..2d8d2f3b83738fb007228f6f84e78dbe881d7f39 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -15,26 +15,45 @@ char *curr_rev;
 char *match_path;
 int header = 0;
 
 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;
        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");
 {
        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");

-       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, ctx.repo);
+               html_raw(buf, size);
+               cgit_close_filter(ctx.repo->source_filter);
+               free(ctx.repo->source_filter->argv[1]);
+               ctx.repo->source_filter->argv[1] = NULL;
+               html("</code></pre></td></tr></table>\n");
+               return;

        }
        }

-       html("</pre></td>\n");
+

        html("<td class='lines'><pre><code>");
        html_txt(buf);
        html("</code></pre></td></tr></table>\n");
        html("<td class='lines'><pre><code>");
        html_txt(buf);
        html("</code></pre></td></tr></table>\n");


@@ -50,7 +69,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
        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) {
        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);
+               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, "",
                for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
                        htmlf("%*s%02x",
                              idx == 16 ? 4 : 1, "",


@@ -65,7 +84,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
        html("</table>\n");
 }
 
        html("</table>\n");
 }
 

-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;
        char *buf;
 {
        enum object_type type;
        char *buf;


@@ -85,15 +104,21 @@ static void print_object(const unsigned char *sha1, char *path)
                return;
        }
 
                return;
        }
 

-       html(" (");
+       htmlf("blob: %s (", sha1_to_hex(sha1));

        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        curr_rev, path);
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        curr_rev, path);

-       htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
+       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;
+       }

 
        if (buffer_is_binary(buf, size))
                print_binary_buffer(buf, size);
        else
 
        if (buffer_is_binary(buf, size))
                print_binary_buffer(buf, size);
        else

-               print_text_buffer(buf, size);
+               print_text_buffer(basename, buf, size);

 }
 
 
 }
 
 


@@ -103,6 +128,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 {
        char *name;
        char *fullpath;
 {
        char *name;
        char *fullpath;

+       char *class;

        enum object_type type;
        unsigned long size = 0;
 
        enum object_type type;
        unsigned long size = 0;
 


@@ -135,7 +161,12 @@ 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-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);
                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);


@@ -146,6 +177,8 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,
                                fullpath);
        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;
        html("</td></tr>\n");
        free(name);
        return 0;


@@ -194,17 +227,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 {
        static int state;
        static char buffer[PATH_MAX];
 {
        static int state;
        static char buffer[PATH_MAX];

-       char *url;

 
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);
 
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);

-               url = cgit_pageurl(ctx.qry.repo, "tree",
-                                  fmt("h=%s&amp;path=%s", curr_rev, buffer));
-               html("/");
-               cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
-                              curr_rev, buffer);
-

                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;
 
                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;
 


@@ -213,7 +239,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                        ls_head();
                        return READ_TREE_RECURSIVE;
                } else {
                        ls_head();
                        return READ_TREE_RECURSIVE;
                } else {

-                       print_object(sha1, buffer);
+                       print_object(sha1, buffer, pathname);

                        return 0;
                }
        }
                        return 0;
                }
        }


@@ -247,16 +273,12 @@ void cgit_print_tree(const char *rev, char *path)
                return;
        }
 
                return;
        }
 

-       html("path: <a href='");
-       html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
-       html("'>root</a>");
-

        if (path == NULL) {
                ls_tree(commit->tree->object.sha1, NULL);
                return;
        }
 
        match_path = path;
        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, NULL);
+       read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);

        ls_tail();
 }
        ls_tail();
 }