ui-tree: Print READMEs below file listings

1 files changed, 13 insertions, 2 deletions

diff --git a/ui-tree.c b/ui-tree.c
index 11e5494..b85e8d6 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -12,6 +12,8 @@
 #include "ui-tree.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-summary.h"
+#include "ui-plain.h"
 
 struct walk_tree_context {
 	char *curr_rev;
@@ -91,7 +93,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
 static void print_object(const struct object_id *oid, const char *path, const char *basename, const char *rev)
 {
 	enum object_type type;
-	char *buf;
+	char *buf, *accept = NULL;
 	unsigned long size;
 	bool is_binary;
 
@@ -112,6 +114,12 @@ static void print_object(const struct object_id *oid, const char *path, const ch
 
 	cgit_set_title_from_path(path);
 
+	accept = getenv("HTTP_ACCEPT");
+	if (accept && (!strncmp(accept, "image/", 6) || !strncmp(accept, "video/", 6))) {
+		cgit_print_plain();
+		return;
+	}
+
 	cgit_print_layout_start();
 	htmlf("blob: %s (", oid_to_hex(oid));
 	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
@@ -311,6 +319,7 @@ static void ls_head(void)
 static void ls_tail(void)
 {
 	html("</table>\n");
+	cgit_print_repo_readme_component(ctx.qry.path);
 	cgit_print_layout_end();
 }
 
@@ -413,8 +422,10 @@ void cgit_print_tree(const char *rev, char *path)
 		  &paths, walk_tree, &walk_tree_ctx);
 	if (walk_tree_ctx.state == 1)
 		ls_tail();
-	else if (walk_tree_ctx.state == 2)
+	else if (walk_tree_ctx.state == 2) {
+		cgit_print_repo_readme_component(ctx.qry.path);
 		cgit_print_layout_end();
+	}
 	else
 		cgit_print_error_page(404, "Not found", "Path not found");