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 816e1213336fe18f010e47570bebd80207fb20b1..0ee38f289a5a21e5385cd1289aa234c33bab30d6 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -22,29 +22,36 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                "<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");
                "<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.source_filter) {
-               html("<tr><td class='lines'><pre><code>");
-               ctx.cfg.source_filter->argv[1] = xstrdup(name);
-               cgit_open_filter(ctx.cfg.source_filter);
+
+       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);
                write(STDOUT_FILENO, buf, size);

-               cgit_close_filter(ctx.cfg.source_filter);
+               cgit_close_filter(ctx.repo->source_filter);

                html("</code></pre></td></tr></table>\n");
                return;
        }
 
                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");
        html("<td class='lines'><pre><code>");
        html_txt(buf);
        html("</code></pre></td></tr></table>\n");


@@ -100,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


@@ -113,6 +126,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;
 


@@ -145,7 +159,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);


@@ -156,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;


@@ -267,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();
 }