List for cgit developers and users
 help / color / mirror / Atom feed
From: list at eworm.de (Christian Hesse)
Subject: [PATCH 3/3] ui-summary: send images plain for about page
Date: Sat, 15 Aug 2015 22:08:23 +0200	[thread overview]
Message-ID: <1439669303-17319-2-git-send-email-list@eworm.de> (raw)
In-Reply-To: <1439669303-17319-1-git-send-email-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

The about page used to display just fine, but images were broken: The
binary image data was embedded in html code.
Use cgit_print_plain() to send images in plain mode and make them
available on about page.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 ui-summary.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/ui-summary.c b/ui-summary.c
index fb04dc3..09ec379 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -9,9 +9,10 @@
 #include "cgit.h"
 #include "ui-summary.h"
 #include "html.h"
+#include "ui-blob.h"
 #include "ui-log.h"
+#include "ui-plain.h"
 #include "ui-refs.h"
-#include "ui-blob.h"
 #include "ui-shared.h"
 
 static int urls;
@@ -100,9 +101,22 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
 
 void cgit_print_repo_readme(char *path)
 {
-	char *filename, *ref;
+	char *filename, *ref, *mimetype;
 	int free_filename = 0;
 
+	mimetype = get_mimetype_for_qrypath(ctx.qry.path);
+
+	if (mimetype && strncmp(mimetype, "image/", 6) == 0) {
+		ctx.page.mimetype = mimetype;
+		ctx.page.charset = NULL;
+		cgit_print_plain();
+		free(mimetype);
+		return;
+	}
+
+	if (mimetype)
+		free(mimetype);
+
 	cgit_print_layout_start();
 	if (ctx.repo->readme.nr == 0)
 		goto done;
-- 
2.5.0



  reply	other threads:[~2015-08-15 20:08 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-14 14:50 [PATCH 1/2] move get_mimetype_from_file() to shared list
2015-08-14 14:50 ` [PATCH 2/2] about: send images plain list
2015-08-14 15:13   ` john
2015-08-14 21:16     ` [PATCH 2/3] " list
2015-08-14 21:16       ` [PATCH 3/3] move shared code to get_mimetype_from_file() list
2015-08-15 11:29         ` john
2015-08-15 20:12           ` list
2015-08-14 23:07       ` [PATCH 2/3] about: send images plain Jason
2015-08-15 20:10         ` list
2015-08-15 11:30       ` john
2015-08-15 20:08         ` [PATCH 2/3] refactor get_mimetype_from_file() to get_mimetype_from_qrypath() list
2015-08-15 20:08           ` list [this message]
2015-08-16 12:19           ` john
2015-08-16 12:51             ` list
2015-08-16 12:53               ` [PATCH 2/3] refactor get_mimetype_from_file() to get_mimetype_for_filename() list
2015-08-16 12:53                 ` [PATCH 3/3] ui-summary: send images plain for about page list

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439669303-17319-2-git-send-email-list@eworm.de \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).