X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/b8be028a309381b83abe924f5e8e01cf02b121a2..d1f3bbe9d22029f45a77bb938c176ccc0c827d46:/ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 383b8ac..b9f487a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -42,49 +42,82 @@ void cgit_print_error(char *msg)
 
 char *cgit_rooturl()
 {
-	if (cgit_virtual_root)
-		return fmt("%s/", cgit_virtual_root);
+	if (ctx.cfg.virtual_root)
+		return fmt("%s/", ctx.cfg.virtual_root);
 	else
-		return cgit_script_name;
+		return ctx.cfg.script_name;
 }
 
 char *cgit_repourl(const char *reponame)
 {
-	if (cgit_virtual_root) {
-		return fmt("%s/%s/", cgit_virtual_root, reponame);
+	if (ctx.cfg.virtual_root) {
+		return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
 	} else {
 		return fmt("?r=%s", reponame);
 	}
 }
 
+char *cgit_fileurl(const char *reponame, const char *pagename,
+		   const char *filename, const char *query)
+{
+	char *tmp;
+	char *delim;
+
+	if (ctx.cfg.virtual_root) {
+		tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
+			  pagename, (filename ? filename:""));
+		delim = "?";
+	} else {
+		tmp = fmt("?url=%s/%s/%s", reponame, pagename,
+			  (filename ? filename : ""));
+		delim = "&";
+	}
+	if (query)
+		tmp = fmt("%s%s%s", tmp, delim, query);
+	return tmp;
+}
+
 char *cgit_pageurl(const char *reponame, const char *pagename,
 		   const char *query)
 {
-	if (cgit_virtual_root) {
-		if (query)
-			return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
-				   pagename, query);
-		else
-			return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
-				   pagename);
-	} else {
-		if (query)
-			return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
-		else
-			return fmt("?r=%s&p=%s", reponame, pagename);
+	return cgit_fileurl(reponame,pagename,0,query);
+}
+
+const char *cgit_repobasename(const char *reponame)
+{
+	/* I assume we don't need to store more than one repo basename */
+	static char rvbuf[1024];
+	int p;
+	const char *rv;
+	strncpy(rvbuf,reponame,sizeof(rvbuf));
+	if(rvbuf[sizeof(rvbuf)-1])
+		die("cgit_repobasename: truncated repository name '%s'", reponame);
+	p = strlen(rvbuf)-1;
+	/* strip trailing slashes */
+	while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+	/* strip trailing .git */
+	if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+		p -= 3; rvbuf[p--] = 0;
 	}
+	/* strip more trailing slashes if any */
+	while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+	/* find last slash in the remaining string */
+	rv = strrchr(rvbuf,'/');
+	if(rv)
+		return ++rv;
+	return rvbuf;
 }
 
 char *cgit_currurl()
 {
-	if (!cgit_virtual_root)
-		return cgit_script_name;
-	else if (cgit_query_page)
-		return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
-	else if (cgit_query_repo)
-		return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
+	if (!ctx.cfg.virtual_root)
+		return ctx.cfg.script_name;
+	else if (ctx.qry.page)
+		return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
+	else if (ctx.qry.repo)
+		return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
 	else
-		return fmt("%s/", cgit_virtual_root);
+		return fmt("%s/", ctx.cfg.virtual_root);
 }
 
 static char *repolink(char *title, char *class, char *page, char *head,
@@ -104,12 +137,12 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		html("'");
 	}
 	html(" href='");
-	if (cgit_virtual_root) {
-		html_attr(cgit_virtual_root);
-		if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
+	if (ctx.cfg.virtual_root) {
+		html_attr(ctx.cfg.virtual_root);
+		if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
 			html("/");
-		html_attr(cgit_repo->url);
-		if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+		html_attr(ctx.repo->url);
+		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
 			html("/");
 		if (page) {
 			html(page);
@@ -118,10 +151,10 @@ static char *repolink(char *title, char *class, char *page, char *head,
 				html_attr(path);
 		}
 	} else {
-		html(cgit_script_name);
+		html(ctx.cfg.script_name);
 		html("?url=");
-		html_attr(cgit_repo->url);
-		if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+		html_attr(ctx.repo->url);
+		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
 			html("/");
 		if (page) {
 			html(page);
@@ -131,7 +164,7 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		}
 		delim = "&";
 	}
-	if (head && strcmp(head, cgit_repo->defbranch)) {
+	if (head && strcmp(head, ctx.repo->defbranch)) {
 		html(delim);
 		html("h=");
 		html_attr(head);
@@ -146,7 +179,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
 	char *delim;
 
 	delim = repolink(title, class, page, head, path);
-	if (rev && strcmp(rev, cgit_query_head)) {
+	if (rev && strcmp(rev, ctx.qry.head)) {
 		html(delim);
 		html("id=");
 		html_attr(rev);
@@ -163,30 +196,67 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-		   char *rev, char *path)
+		   char *rev, char *path, int ofs, char *grep, char *pattern)
 {
-	reporevlink("log", name, title, class, head, rev, path);
+	char *delim;
+
+	delim = repolink(title, class, "log", head, path);
+	if (rev && strcmp(rev, ctx.qry.head)) {
+		html(delim);
+		html("id=");
+		html_attr(rev);
+		delim = "&";
+	}
+	if (grep && pattern) {
+		html(delim);
+		html("qt=");
+		html_attr(grep);
+		delim = "&";
+		html(delim);
+		html("q=");
+		html_attr(pattern);
+	}
+	if (ofs > 0) {
+		html(delim);
+		html("ofs=");
+		htmlf("%d", ofs);
+	}
+	html("'>");
+	html_txt(name);
+	html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
 		      char *rev)
 {
-	if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
-		name[cgit_max_msg_len] = '\0';
-		name[cgit_max_msg_len - 1] = '.';
-		name[cgit_max_msg_len - 2] = '.';
-		name[cgit_max_msg_len - 3] = '.';
+	if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
+		name[ctx.cfg.max_msg_len] = '\0';
+		name[ctx.cfg.max_msg_len - 1] = '.';
+		name[ctx.cfg.max_msg_len - 2] = '.';
+		name[ctx.cfg.max_msg_len - 3] = '.';
 	}
 	reporevlink("commit", name, title, class, head, rev, NULL);
 }
 
+void cgit_refs_link(char *name, char *title, char *class, char *head,
+		    char *rev, char *path)
+{
+	reporevlink("refs", name, title, class, head, rev, path);
+}
+
+void cgit_snapshot_link(char *name, char *title, char *class, char *head,
+			char *rev, char *archivename)
+{
+	reporevlink("snapshot", name, title, class, head, rev, archivename);
+}
+
 void cgit_diff_link(char *name, char *title, char *class, char *head,
 		    char *new_rev, char *old_rev, char *path)
 {
 	char *delim;
 
 	delim = repolink(title, class, "diff", head, path);
-	if (new_rev && strcmp(new_rev, cgit_query_head)) {
+	if (new_rev && strcmp(new_rev, ctx.qry.head)) {
 		html(delim);
 		html("id=");
 		html_attr(new_rev);
@@ -202,11 +272,46 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 	html("</a>");
 }
 
+void cgit_patch_link(char *name, char *title, char *class, char *head,
+		     char *rev)
+{
+	reporevlink("patch", name, title, class, head, rev, NULL);
+}
+
+void cgit_object_link(struct object *obj)
+{
+	char *page, *arg, *url;
+
+	if (obj->type == OBJ_COMMIT) {
+                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
+				 ctx.qry.head, sha1_to_hex(obj->sha1));
+		return;
+	} else if (obj->type == OBJ_TREE) {
+		page = "tree";
+		arg = "id";
+	} else if (obj->type == OBJ_TAG) {
+		page = "tag";
+		arg = "id";
+	} else {
+		page = "blob";
+		arg = "id";
+	}
+
+	url = cgit_pageurl(ctx.qry.repo, page,
+			   fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
+	html_link_open(url, NULL, NULL);
+	htmlf("%s %s", typename(obj->type),
+	      sha1_to_hex(obj->sha1));
+	html_link_close();
+}
+
 void cgit_print_date(time_t secs, char *format)
 {
 	char buf[64];
 	struct tm *time;
 
+	if (!secs)
+		return;
 	time = gmtime(&secs);
 	strftime(buf, sizeof(buf)-1, format, time);
 	html_txt(buf);
@@ -216,6 +321,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
 	time_t now, secs;
 
+	if (!t)
+		return;
 	time(&now);
 	secs = now - t;
 
@@ -255,20 +362,22 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
-	html("Content-Type: text/html; charset=utf-8\n");
+	html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
 	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
 	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
 					 ttl_seconds(item->ttl)));
 	html("\n");
 	html(cgit_doctype);
-	html("<html>\n");
+	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
 	html("<head>\n");
 	html("<title>");
 	html_txt(title);
 	html("</title>\n");
-	htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
+	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
+	if (ctx.cfg.robots && *ctx.cfg.robots)
+		htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);
 	html("<link rel='stylesheet' type='text/css' href='");
-	html_attr(cgit_css);
+	html_attr(ctx.cfg.css);
 	html("'/>\n");
 	html("</head>\n");
 	html("<body>\n");
@@ -276,72 +385,177 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 
 void cgit_print_docend()
 {
-	html("</td></tr></table>");
-	html("</body>\n</html>\n");
+	html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
+}
+
+int print_branch_option(const char *refname, const unsigned char *sha1,
+			int flags, void *cb_data)
+{
+	char *name = (char *)refname;
+	html_option(name, name, ctx.qry.head);
+	return 0;
+}
+
+int print_archive_ref(const char *refname, const unsigned char *sha1,
+		       int flags, void *cb_data)
+{
+	struct tag *tag;
+	struct taginfo *info;
+	struct object *obj;
+	char buf[256], *url;
+	unsigned char fileid[20];
+	int *header = (int *)cb_data;
+
+	if (prefixcmp(refname, "refs/archives"))
+		return 0;
+	strncpy(buf, refname+14, sizeof(buf));
+	obj = parse_object(sha1);
+	if (!obj)
+		return 1;
+	if (obj->type == OBJ_TAG) {
+		tag = lookup_tag(sha1);
+		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
+			return 0;
+		hashcpy(fileid, tag->tagged->sha1);
+	} else if (obj->type != OBJ_BLOB) {
+		return 0;
+	} else {
+		hashcpy(fileid, sha1);
+	}
+	if (!*header) {
+		html("<h1>download</h1>\n");
+		*header = 1;
+	}
+	url = cgit_pageurl(ctx.qry.repo, "blob",
+			   fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
+			       buf));
+	html_link_open(url, NULL, "menu");
+	html_txt(strlpart(buf, 20));
+	html_link_close();
+	return 0;
+}
+
+void add_hidden_formfields(int incl_head, int incl_search, char *page)
+{
+	char *url;
+
+	if (!ctx.cfg.virtual_root) {
+		url = fmt("%s/%s", ctx.qry.repo, page);
+		if (ctx.qry.path)
+			url = fmt("%s/%s", url, ctx.qry.path);
+		html_hidden("url", url);
+	}
+
+	if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+		html_hidden("h", ctx.qry.head);
+
+	if (ctx.qry.sha1)
+		html_hidden("id", ctx.qry.sha1);
+	if (ctx.qry.sha2)
+		html_hidden("id2", ctx.qry.sha2);
+
+	if (incl_search) {
+		if (ctx.qry.grep)
+			html_hidden("qt", ctx.qry.grep);
+		if (ctx.qry.search)
+			html_hidden("q", ctx.qry.search);
+	}
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
-	html("<table id='layout'>");
-	html("<tr><td id='header'><a href='");
+	static const char *default_info = "This is cgit, a fast webinterface for git repositories";
+	int header = 0;
+	char *url;
+
+	html("<table id='layout' summary=''>\n");
+	html("<tr><td id='sidebar'>\n");
+	html("<table class='sidebar' cellspacing='0' summary=''>\n");
+	html("<tr><td class='sidebar'>\n<a href='");
 	html_attr(cgit_rooturl());
-	html("'>");
-	html_txt(cgit_root_title);
-	html("</a></td><td id='logo'>");
-	html("<a href='");
-	html_attr(cgit_logo_link);
-	htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
-	html("</td></tr>");
-	html("<tr><td id='crumb'>");
-	if (cgit_query_repo) {
-		html_txt(cgit_repo->name);
-		html(" (");
-		html_txt(cgit_query_head);
-		html(") : &nbsp;");
-		reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
+	htmlf("'><img src='%s' alt='cgit'/></a>\n",
+	      ctx.cfg.logo);
+	html("</td></tr>\n<tr><td class='sidebar'>\n");
+	if (ctx.qry.repo) {
+		html("<h1 class='first'>");
+		html_txt(strrpart(ctx.repo->name, 20));
+		html("</h1>\n");
+		html_txt(ctx.repo->desc);
+		if (ctx.repo->owner) {
+			html("<h1>owner</h1>\n");
+			html_txt(ctx.repo->owner);
+		}
+		html("<h1>navigate</h1>\n");
+		reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
 			    NULL, NULL);
-		html(" ");
-		cgit_log_link("log", NULL, NULL, cgit_query_head,
-			      cgit_query_sha1, cgit_query_path);
-		html(" ");
-		cgit_tree_link("files", NULL, NULL, cgit_query_head,
-			       cgit_query_sha1, cgit_query_path);
-		html(" ");
-		cgit_commit_link("commit", NULL, NULL, cgit_query_head,
-			      cgit_query_sha1);
-		html(" ");
-		cgit_diff_link("diff", NULL, NULL, cgit_query_head,
-			       cgit_query_sha1, cgit_query_sha2,
-			       cgit_query_path);
-	} else {
-		html_txt("Index of repositories");
-	}
-	html("</td>");
-	html("<td id='search'>");
-	if (show_search) {
-		html("<form method='get' action='");
-		html_attr(cgit_currurl());
-		html("'>");
-		if (!cgit_virtual_root) {
-			if (cgit_query_repo)
-				html_hidden("r", cgit_query_repo);
-			if (cgit_query_page)
-				html_hidden("p", cgit_query_page);
+		cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL,
+			      0, NULL, NULL);
+		cgit_tree_link("tree", NULL, "menu", ctx.qry.head,
+			       ctx.qry.sha1, NULL);
+		cgit_commit_link("commit", NULL, "menu", ctx.qry.head,
+			      ctx.qry.sha1);
+		cgit_diff_link("diff", NULL, "menu", ctx.qry.head,
+			       ctx.qry.sha1, ctx.qry.sha2, NULL);
+		cgit_patch_link("patch", NULL, "menu", ctx.qry.head,
+				ctx.qry.sha1);
+
+		for_each_ref(print_archive_ref, &header);
+
+		if (ctx.repo->clone_url || ctx.cfg.clone_prefix) {
+			html("<h1>clone</h1>\n");
+			if (ctx.repo->clone_url)
+				url = ctx.repo->clone_url;
+			else
+				url = fmt("%s%s", ctx.cfg.clone_prefix,
+					  ctx.repo->url);
+			html("<a class='menu' href='");
+			html_attr(url);
+			html("' title='");
+			html_attr(url);
+			html("'>\n");
+			html_txt(strrpart(url, 20));
+			html("</a>\n");
 		}
-		if (cgit_query_head)
-			html_hidden("h", cgit_query_head);
-		if (cgit_query_sha1)
-			html_hidden("id", cgit_query_sha1);
-		if (cgit_query_sha2)
-			html_hidden("id2", cgit_query_sha2);
-		html("<input type='text' name='q' value='");
-		html_attr(cgit_query_search);
-		html("'/></form>");
+
+		html("<h1>branch</h1>\n");
+		html("<form method='get' action=''>\n");
+		add_hidden_formfields(0, 1, ctx.qry.page);
+//		html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
+		html("<select name='h' onchange='this.form.submit();'>\n");
+		for_each_branch_ref(print_branch_option, ctx.qry.head);
+		html("</select>\n");
+//		html("</td><td>");
+		html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+//		html("</td></tr></table>");
+		html("</form>\n");
+
+		html("<h1>search</h1>\n");
+		html("<form method='get' action='");
+		if (ctx.cfg.virtual_root)
+			html_attr(cgit_fileurl(ctx.qry.repo, "log",
+					       ctx.qry.path, NULL));
+		html("'>\n");
+		add_hidden_formfields(1, 0, "log");
+		html("<select name='qt'>\n");
+		html_option("grep", "log msg", ctx.qry.grep);
+		html_option("author", "author", ctx.qry.grep);
+		html_option("committer", "committer", ctx.qry.grep);
+		html("</select>\n");
+		html("<input class='txt' type='text' name='q' value='");
+		html_attr(ctx.qry.search);
+		html("'/>\n");
+		html("</form>\n");
+	} else {
+		if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info))
+			html(default_info);
 	}
-	html("</td></tr>");
-	html("<tr><td id='content' colspan='2'>");
+
+	html("</td></tr></table></td>\n");
+
+	html("<td id='content'>\n");
 }
 
+
 void cgit_print_snapshot_start(const char *mimetype, const char *filename,
 			       struct cacheitem *item)
 {
@@ -352,3 +566,5 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
 					 ttl_seconds(item->ttl)));
 	html("\n");
 }
+
+/* vim:set sw=8: */