diff options
| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | cgitrc.5.txt | 8 | ||||
| -rw-r--r-- | ui-tree.c | 18 |
4 files changed, 25 insertions, 4 deletions
| @@ -100,6 +100,8 @@ void config_cb(const char *name, const char *value) | |||
| 100 | ctx.cfg.max_repo_count = atoi(value); | 100 | ctx.cfg.max_repo_count = atoi(value); |
| 101 | else if (!strcmp(name, "max-commit-count")) | 101 | else if (!strcmp(name, "max-commit-count")) |
| 102 | ctx.cfg.max_commit_count = atoi(value); | 102 | ctx.cfg.max_commit_count = atoi(value); |
| 103 | else if (!strcmp(name, "source-filter")) | ||
| 104 | ctx.cfg.source_filter = new_filter(value, 1); | ||
| 103 | else if (!strcmp(name, "summary-log")) | 105 | else if (!strcmp(name, "summary-log")) |
| 104 | ctx.cfg.summary_log = atoi(value); | 106 | ctx.cfg.summary_log = atoi(value); |
| 105 | else if (!strcmp(name, "summary-branches")) | 107 | else if (!strcmp(name, "summary-branches")) |
| @@ -183,6 +183,7 @@ struct cgit_config { | |||
| 183 | int summary_branches; | 183 | int summary_branches; |
| 184 | int summary_log; | 184 | int summary_log; |
| 185 | int summary_tags; | 185 | int summary_tags; |
| 186 | struct cgit_filter *source_filter; | ||
| 186 | }; | 187 | }; |
| 187 | 188 | ||
| 188 | struct cgit_page { | 189 | struct cgit_page { |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index a207fe0..d420ad4 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
| @@ -198,6 +198,14 @@ snapshots:: | |||
| 198 | "zip" zip-file | 198 | "zip" zip-file |
| 199 | Default value: none. | 199 | Default value: none. |
| 200 | 200 | ||
| 201 | source-filter:: | ||
| 202 | Specifies a command which will be invoked to format plaintext blobs | ||
| 203 | in the tree view. The command will get the blob content on its STDIN | ||
| 204 | and the name of the blob as its only command line argument. The STDOUT | ||
| 205 | from the command will be included verbatim as the blob contents, i.e. | ||
| 206 | this can be used to implement e.g. syntax highlighting. Default value: | ||
| 207 | none. | ||
| 208 | |||
| 201 | summary-branches:: | 209 | summary-branches:: |
| 202 | Specifies the number of branches to display in the repository "summary" | 210 | Specifies the number of branches to display in the repository "summary" |
| 203 | view. Default value: "10". | 211 | view. Default value: "10". |
| @@ -15,13 +15,23 @@ 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; |
| @@ -65,7 +75,7 @@ static void print_binary_buffer(char *buf, unsigned long size) | |||
| 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; |
| @@ -93,7 +103,7 @@ static void print_object(const unsigned char *sha1, char *path) | |||
| 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 | ||
| @@ -213,7 +223,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | |||
| 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 | } |
