X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/7fb12a8ee0789e3eab2680ae6c3fde0f0f233d22..b73df8098f261ecbd4bc5ba689f9766a1a75f9a0:/ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 5598d08..8e81ac4 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,7 +1,6 @@
 /* ui-summary.c: functions for generating repo summary page
  *
- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -10,39 +9,16 @@
 #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 <libgen.h>
+#include "ui-shared.h"
 
-static void print_url(char *base, char *suffix)
-{
-	int columns = 3;
-	struct strbuf basebuf = STRBUF_INIT;
+static int urls;
 
-	if (ctx.repo->enable_log_filecount)
-		columns++;
-	if (ctx.repo->enable_log_linecount)
-		columns++;
-
-	if (!base || !*base)
-		return;
-	if (suffix && *suffix) {
-		strbuf_addf(&basebuf, "%s/%s", base, suffix);
-		base = basebuf.buf;
-	}
-	htmlf("<tr><td colspan='%d'><a href='", columns);
-	html_url_path(base);
-	html("'>");
-	html_txt(base);
-	html("</a></td></tr>\n");
-	strbuf_release(&basebuf);
-}
-
-static void print_urls(char *txt, char *suffix)
+static void print_url(const char *url)
 {
-	char *h = txt, *t, c;
-	int urls = 0;
 	int columns = 3;
 
 	if (ctx.repo->enable_log_filecount)
@@ -50,28 +26,21 @@ static void print_urls(char *txt, char *suffix)
 	if (ctx.repo->enable_log_linecount)
 		columns++;
 
-
-	while (h && *h) {
-		while (h && *h == ' ')
-			h++;
-		if (!*h)
-			break;
-		t = h;
-		while (t && *t && *t != ' ')
-			t++;
-		c = *t;
-		*t = 0;
-		if (urls++ == 0) {
-			htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
-			htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
-		}
-		print_url(h, suffix);
-		*t = c;
-		h = t;
+	if (urls++ == 0) {
+		htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+		htmlf("<tr class='nohover'><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
 	}
+
+	htmlf("<tr><td colspan='%d'><a rel='vcs-git' href='", columns);
+	html_url_path(url);
+	html("' title='");
+	html_attr(ctx.repo->name);
+	html(" Git repository'>");
+	html_txt(url);
+	html("</a></td></tr>\n");
 }
 
-void cgit_print_summary()
+void cgit_print_summary(void)
 {
 	int columns = 3;
 
@@ -80,6 +49,7 @@ void cgit_print_summary()
 	if (ctx.repo->enable_log_linecount)
 		columns++;
 
+	cgit_print_layout_start();
 	html("<table summary='repository info' class='list nowrap'>");
 	cgit_print_branches(ctx.cfg.summary_branches);
 	htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
@@ -89,11 +59,10 @@ void cgit_print_summary()
 		cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
 			       NULL, NULL, 0, 0, 0);
 	}
-	if (ctx.repo->clone_url)
-		print_urls(expand_macros(ctx.repo->clone_url), NULL);
-	else if (ctx.cfg.clone_prefix)
-		print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
+	urls = 0;
+	cgit_add_clone_urls(print_url);
 	html("</table>");
+	cgit_print_layout_end();
 }
 
 /* The caller must free the return value. */
@@ -113,11 +82,11 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
 		full_path = xstrdup(path);
 	} else
 		full_path = fmtalloc("%s/%s", base_dir, path);
-	
+
 	if (!ref) {
 		resolved_base = realpath(base_dir, NULL);
 		resolved_full = realpath(full_path, NULL);
-		if (!resolved_base || !resolved_full || strncmp(resolved_base, resolved_full, strlen(resolved_base))) {
+		if (!resolved_base || !resolved_full || !starts_with(resolved_full, resolved_base)) {
 			free(full_path);
 			full_path = NULL;
 		}
@@ -132,12 +101,23 @@ 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;
 
-	if (ctx.repo->readme.nr == 0)
+	mimetype = get_mimetype_for_filename(path);
+	if (mimetype && (!strncmp(mimetype, "image/", 6) || !strncmp(mimetype, "video/", 6))) {
+		ctx.page.mimetype = mimetype;
+		ctx.page.charset = NULL;
+		cgit_print_plain();
+		free(mimetype);
 		return;
-	
+	}
+	free(mimetype);
+
+	cgit_print_layout_start();
+	if (ctx.repo->readme.nr == 0)
+		goto done;
+
 	filename = ctx.repo->readme.items[0].string;
 	ref = ctx.repo->readme.items[0].util;
 
@@ -145,26 +125,24 @@ void cgit_print_repo_readme(char *path)
 		free_filename = 1;
 		filename = append_readme_path(filename, ref, path);
 		if (!filename)
-			return;
+			goto done;
 	}
 
 	/* Print the calculated readme, either from the git repo or from the
 	 * filesystem, while applying the about-filter.
 	 */
 	html("<div id='summary'>");
-	if (ctx.repo->about_filter) {
-		ctx.repo->about_filter->argv[1] = filename;
-		cgit_open_filter(ctx.repo->about_filter);
-	}
+	cgit_open_filter(ctx.repo->about_filter, filename);
 	if (ref)
 		cgit_print_file(filename, ref, 1);
 	else
 		html_include(filename);
-	if (ctx.repo->about_filter) {
-		cgit_close_filter(ctx.repo->about_filter);
-		ctx.repo->about_filter->argv[1] = NULL;
-	}
+	cgit_close_filter(ctx.repo->about_filter);
+
 	html("</div>");
 	if (free_filename)
 		free(filename);
+
+done:
+	cgit_print_layout_end();
 }