Merge branch 'ml/plain-improvements-part1'

author: Lars Hjemli 2010-06-19 11:40:34 +0200
committer: Lars Hjemli 2010-06-19 11:40:34 +0200
commit: d6dc3aee9acadfe368864f24ea18ccd47bbb0b9b (patch)
tree: 344d1af1e29d7f2373df7e7508308e777f381a95
parent: Merge branch 'sn/subject-link' (diff)
parent: ui-plain: print directory listings (diff)
download: cgit-d6dc3aee9acadfe368864f24ea18ccd47bbb0b9b.tar.gz
cgit-d6dc3aee9acadfe368864f24ea18ccd47bbb0b9b.zip
1 files changed, 60 insertions, 8 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 66cb19c..da76406 100644
--- a/ui-plain.c
+++ b/ui-plain.c

@@ -10,8 +10,7 @@
 #include "html.h"
 #include "ui-shared.h"
-char *curr_rev;
+int match_baselen;
-char *match_path;
 int match;
 static void print_object(const unsigned char *sha1, const char *path)
@@ -53,17 +52,63 @@ static void print_object(const unsigned char *sha1, const char *path)
        match = 1;
 }
+static void print_dir(const unsigned char *sha1, const char *path,
+                      const char *base)
+{
+        char *fullpath;
+        if (path[0] || base[0])
+                fullpath = fmt("/%s%s/", base, path);
+        else
+                fullpath = "/";
+        ctx.page.etag = sha1_to_hex(sha1);
+        cgit_print_http_headers(&ctx);
+        htmlf("<html><head><title>%s</title></head>\n<body>\n"
+              " <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
+        if (path[0] || base[0])
+              html("  <li><a href=\"../\">../</a></li>\n");
+        match = 2;
+}
+static void print_dir_entry(const unsigned char *sha1, const char *path,
+                            unsigned mode)
+{
+        const char *sep = "";
+        if (S_ISDIR(mode))
+                sep = "/";
+        htmlf("  <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
+        match = 2;
+}
+static void print_dir_tail(void)
+{
+        html(" </ul>\n</body></html>\n");
+}
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                     const char *pathname, unsigned mode, int stage,
                     void *cbdata)
 {
-        if (S_ISDIR(mode))
+        if (baselen == match_baselen) {
+                if (S_ISREG(mode))
+                        print_object(sha1, pathname);
+                else if (S_ISDIR(mode)) {
+                        print_dir(sha1, pathname, base);
+                        return READ_TREE_RECURSIVE;
+                }
+        }
+        else if (baselen > match_baselen)
+                print_dir_entry(sha1, pathname, mode);
+        else if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
-        if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
+        return 0;
-            !strcmp(pathname, match_path + baselen))
+}
-                print_object(sha1, pathname);
+static int basedir_len(const char *path)
+{
+        char *p = strrchr(path, '/');
+        if (p)
+                return p - path + 1;
        return 0;
 }
@@ -77,7 +122,6 @@ void cgit_print_plain(struct cgit_context *ctx)
        if (!rev)
                rev = ctx->qry.head;
-        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {
                html_status(404, "Not found", 0);
                return;
@@ -87,8 +131,16 @@ void cgit_print_plain(struct cgit_context *ctx)
                html_status(404, "Not found", 0);
                return;
        }
-        match_path = ctx->qry.path;
+        if (!paths[0]) {
+                paths[0] = "";
+                match_baselen = -1;
+                print_dir(commit->tree->object.sha1, "", "");
+        }
+        else
+                match_baselen = basedir_len(paths[0]);
        read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
        if (!match)
                html_status(404, "Not found", 0);
+        else if (match == 2)
+                print_dir_tail();
 }
author	Lars Hjemli	2010-06-19 11:40:34 +0200
committer	Lars Hjemli	2010-06-19 11:40:34 +0200
commit	d6dc3aee9acadfe368864f24ea18ccd47bbb0b9b (patch)
tree	344d1af1e29d7f2373df7e7508308e777f381a95
parent	Merge branch 'sn/subject-link' (diff)
parent	ui-plain: print directory listings (diff)
download	cgit-d6dc3aee9acadfe368864f24ea18ccd47bbb0b9b.tar.gz cgit-d6dc3aee9acadfe368864f24ea18ccd47bbb0b9b.zip

diff --git a/ui-plain.c b/ui-plain.c index 66cb19c..da76406 100644 --- a/ui-plain.c +++ b/ui-plain.c
@@ -10,8 +10,7 @@
10	#include "html.h"	10	#include "html.h"
11	#include "ui-shared.h"	11	#include "ui-shared.h"
12		12
13	char *curr_rev;	13	int match_baselen;
14	char *match_path;
15	int match;	14	int match;
16		15
17	static void print_object(const unsigned char sha1, const char path)	16	static void print_object(const unsigned char sha1, const char path)
@@ -53,17 +52,63 @@ static void print_object(const unsigned char sha1, const char path)
53	match = 1;	52	match = 1;
54	}	53	}
55		54
		55	static void print_dir(const unsigned char sha1, const char path,
		56	const char *base)
		57	{
		58	char *fullpath;
		59	if (path[0] \|\| base[0])
		60	fullpath = fmt("/%s%s/", base, path);
		61	else
		62	fullpath = "/";
		63	ctx.page.etag = sha1_to_hex(sha1);
		64	cgit_print_http_headers(&ctx);
		65	htmlf("<html><head><title>%s</title></head>\n<body>\n"
		66	" <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
		67	if (path[0] \|\| base[0])
		68	html(" <li><a href=\"../\">../</a></li>\n");
		69	match = 2;
		70	}
		71
		72	static void print_dir_entry(const unsigned char sha1, const char path,
		73	unsigned mode)
		74	{
		75	const char *sep = "";
		76	if (S_ISDIR(mode))
		77	sep = "/";
		78	htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
		79	match = 2;
		80	}
		81
		82	static void print_dir_tail(void)
		83	{
		84	html(" </ul>\n</body></html>\n");
		85	}
		86
56	static int walk_tree(const unsigned char sha1, const char base, int baselen,	87	static int walk_tree(const unsigned char sha1, const char base, int baselen,
57	const char *pathname, unsigned mode, int stage,	88	const char *pathname, unsigned mode, int stage,
58	void *cbdata)	89	void *cbdata)
59	{	90	{
60	if (S_ISDIR(mode))	91	if (baselen == match_baselen) {
		92	if (S_ISREG(mode))
		93	print_object(sha1, pathname);
		94	else if (S_ISDIR(mode)) {
		95	print_dir(sha1, pathname, base);
		96	return READ_TREE_RECURSIVE;
		97	}
		98	}
		99	else if (baselen > match_baselen)
		100	print_dir_entry(sha1, pathname, mode);
		101	else if (S_ISDIR(mode))
61	return READ_TREE_RECURSIVE;	102	return READ_TREE_RECURSIVE;
62		103
63	if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&	104	return 0;
64	!strcmp(pathname, match_path + baselen))	105	}
65	print_object(sha1, pathname);
66		106
		107	static int basedir_len(const char *path)
		108	{
		109	char *p = strrchr(path, '/');
		110	if (p)
		111	return p - path + 1;
67	return 0;	112	return 0;
68	}	113	}
69		114
@@ -77,7 +122,6 @@ void cgit_print_plain(struct cgit_context *ctx)
77	if (!rev)	122	if (!rev)
78	rev = ctx->qry.head;	123	rev = ctx->qry.head;
79		124
80	curr_rev = xstrdup(rev);
81	if (get_sha1(rev, sha1)) {	125	if (get_sha1(rev, sha1)) {
82	html_status(404, "Not found", 0);	126	html_status(404, "Not found", 0);
83	return;	127	return;
@@ -87,8 +131,16 @@ void cgit_print_plain(struct cgit_context *ctx)
87	html_status(404, "Not found", 0);	131	html_status(404, "Not found", 0);
88	return;	132	return;
89	}	133	}
90	match_path = ctx->qry.path;	134	if (!paths[0]) {
		135	paths[0] = "";
		136	match_baselen = -1;
		137	print_dir(commit->tree->object.sha1, "", "");
		138	}
		139	else
		140	match_baselen = basedir_len(paths[0]);
91	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);	141	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
92	if (!match)	142	if (!match)
93	html_status(404, "Not found", 0);	143	html_status(404, "Not found", 0);
		144	else if (match == 2)
		145	print_dir_tail();
94	}	146	}