author | Lars Hjemli <hjemli@gmail.com> | 2009-07-31 14:55:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-31 15:41:21 (UTC) |
commit | 46b7abed99e957008c01c02cf612aa526ba92f04 (patch) (unidiff) | |
tree | 2cdbfe5281c2ffa645def488d53db0a8b82842f4 /ui-tree.c | |
parent | 18dfbdc099c1398016427b6fa7f1a1facb363998 (diff) | |
download | cgit-46b7abed99e957008c01c02cf612aa526ba92f04.zip cgit-46b7abed99e957008c01c02cf612aa526ba92f04.tar.gz cgit-46b7abed99e957008c01c02cf612aa526ba92f04.tar.bz2 |
ui-tree: add support for source-filter option
This new option is used to specify an external command which will be
executed when displaying blob content in the tree view. Blob content
will be written to STDIN of the filter and STDOUT from the filter
will be included verbatim in the html output from cgit. The file name
of the blob will be passed as the only argument to the filter command.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-tree.c | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -10,23 +10,33 @@ | |||
10 | #include "cgit.h" | 10 | #include "cgit.h" |
11 | #include "html.h" | 11 | #include "html.h" |
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | 13 | ||
14 | char *curr_rev; | 14 | char *curr_rev; |
15 | char *match_path; | 15 | char *match_path; |
16 | int header = 0; | 16 | int header = 0; |
17 | 17 | ||
18 | static void print_text_buffer(char *buf, unsigned long size) | 18 | static void print_text_buffer(const char *name, char *buf, unsigned long size) |
19 | { | 19 | { |
20 | unsigned long lineno, idx; | 20 | unsigned long lineno, idx; |
21 | const char *numberfmt = | 21 | const char *numberfmt = |
22 | "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; | 22 | "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; |
23 | 23 | ||
24 | html("<table summary='blob content' class='blob'>\n"); | 24 | html("<table summary='blob content' class='blob'>\n"); |
25 | if (ctx.cfg.source_filter) { | ||
26 | html("<tr><td class='lines'><pre><code>"); | ||
27 | ctx.cfg.source_filter->argv[1] = xstrdup(name); | ||
28 | cgit_open_filter(ctx.cfg.source_filter); | ||
29 | write(STDOUT_FILENO, buf, size); | ||
30 | cgit_close_filter(ctx.cfg.source_filter); | ||
31 | html("</code></pre></td></tr></table>\n"); | ||
32 | return; | ||
33 | } | ||
34 | |||
25 | html("<tr><td class='linenumbers'><pre>"); | 35 | html("<tr><td class='linenumbers'><pre>"); |
26 | idx = 0; | 36 | idx = 0; |
27 | lineno = 0; | 37 | lineno = 0; |
28 | 38 | ||
29 | if (size) { | 39 | if (size) { |
30 | htmlf(numberfmt, ++lineno); | 40 | htmlf(numberfmt, ++lineno); |
31 | while(idx < size - 1) { // skip absolute last newline | 41 | while(idx < size - 1) { // skip absolute last newline |
32 | if (buf[idx] == '\n') | 42 | if (buf[idx] == '\n') |
@@ -60,17 +70,17 @@ static void print_binary_buffer(char *buf, unsigned long size) | |||
60 | ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.'; | 70 | ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.'; |
61 | ascii[idx] = '\0'; | 71 | ascii[idx] = '\0'; |
62 | html_txt(ascii); | 72 | html_txt(ascii); |
63 | html("</td></tr>\n"); | 73 | html("</td></tr>\n"); |
64 | } | 74 | } |
65 | html("</table>\n"); | 75 | html("</table>\n"); |
66 | } | 76 | } |
67 | 77 | ||
68 | static void print_object(const unsigned char *sha1, char *path) | 78 | static void print_object(const unsigned char *sha1, char *path, const char *basename) |
69 | { | 79 | { |
70 | enum object_type type; | 80 | enum object_type type; |
71 | char *buf; | 81 | char *buf; |
72 | unsigned long size; | 82 | unsigned long size; |
73 | 83 | ||
74 | type = sha1_object_info(sha1, &size); | 84 | type = sha1_object_info(sha1, &size); |
75 | if (type == OBJ_BAD) { | 85 | if (type == OBJ_BAD) { |
76 | cgit_print_error(fmt("Bad object name: %s", | 86 | cgit_print_error(fmt("Bad object name: %s", |
@@ -88,17 +98,17 @@ static void print_object(const unsigned char *sha1, char *path) | |||
88 | html(" ("); | 98 | html(" ("); |
89 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, | 99 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
90 | curr_rev, path); | 100 | curr_rev, path); |
91 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); | 101 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
92 | 102 | ||
93 | if (buffer_is_binary(buf, size)) | 103 | if (buffer_is_binary(buf, size)) |
94 | print_binary_buffer(buf, size); | 104 | print_binary_buffer(buf, size); |
95 | else | 105 | else |
96 | print_text_buffer(buf, size); | 106 | print_text_buffer(basename, buf, size); |
97 | } | 107 | } |
98 | 108 | ||
99 | 109 | ||
100 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, | 110 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
101 | const char *pathname, unsigned int mode, int stage, | 111 | const char *pathname, unsigned int mode, int stage, |
102 | void *cbdata) | 112 | void *cbdata) |
103 | { | 113 | { |
104 | char *name; | 114 | char *name; |
@@ -208,17 +218,17 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | |||
208 | if (strcmp(match_path, buffer)) | 218 | if (strcmp(match_path, buffer)) |
209 | return READ_TREE_RECURSIVE; | 219 | return READ_TREE_RECURSIVE; |
210 | 220 | ||
211 | if (S_ISDIR(mode)) { | 221 | if (S_ISDIR(mode)) { |
212 | state = 1; | 222 | state = 1; |
213 | ls_head(); | 223 | ls_head(); |
214 | return READ_TREE_RECURSIVE; | 224 | return READ_TREE_RECURSIVE; |
215 | } else { | 225 | } else { |
216 | print_object(sha1, buffer); | 226 | print_object(sha1, buffer, pathname); |
217 | return 0; | 227 | return 0; |
218 | } | 228 | } |
219 | } | 229 | } |
220 | ls_item(sha1, base, baselen, pathname, mode, stage, NULL); | 230 | ls_item(sha1, base, baselen, pathname, mode, stage, NULL); |
221 | return 0; | 231 | return 0; |
222 | } | 232 | } |
223 | 233 | ||
224 | 234 | ||