ui-tree: add link to plain view for blobs in tree listing

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 7bf2ad2cc409ac80173c454135e1a18624637c9b..0ee38f289a5a21e5385cd1289aa234c33bab30d6 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -23,19 +23,24 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
 
        html("<table summary='blob content' class='blob'>\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");

        }
        }

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

 
        if (ctx.repo->source_filter) {
                html("<td class='lines'><pre><code>");
 
        if (ctx.repo->source_filter) {
                html("<td class='lines'><pre><code>");


@@ -102,6 +107,12 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
                        curr_rev, path);
        htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
 
                        curr_rev, path);
        htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
 

+       if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
+               htmlf("<div class='error'>blob size (%dKB) 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


@@ -164,6 +175,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;


@@ -275,6 +288,6 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        match_path = path;
        }
 
        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();
 }