ui-tree: link to plain view instead of blob view

The urls for plain view makes it possible to download blobs without knowing their SHA1, but the function needs to be promoted and the link from tree view seems like a perfect fit. PS: Although hidden, the blob view still is nice for direct blob access so there's no point in removing it. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Lars Hjemli <hjemli@gmail.com> 2008-08-06 09:07:13 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2008-08-06 09:21:30 (UTC)
commit: 65b7b876aaaf50fc15060533359d6561f4f1819a (patch) (unidiff)
tree: c5cfe73456cf31afb13bcb12c5331fa711f89d71 /ui-tree.c
parent: e5da4bca54574522b28f88cab0dc8ebad9e35a73 (diff)
download: cgit-65b7b876aaaf50fc15060533359d6561f4f1819a.zip
cgit-65b7b876aaaf50fc15060533359d6561f4f1819a.tar.gz
cgit-65b7b876aaaf50fc15060533359d6561f4f1819a.tar.bz2
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 9a837e2..79332fc 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,169 +1,169 @@
 /* ui-tree.c: functions for tree output
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 char *curr_rev;
 char *match_path;
 int header = 0;
 static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;
        char *buf;
        unsigned long size, lineno, start, idx;
        const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
                cgit_print_error(fmt("Bad object name: %s",
                                     sha1_to_hex(sha1)));
                return;
        }
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
                cgit_print_error(fmt("Error reading object %s",
                                     sha1_to_hex(sha1)));
                return;
        }
-        html(" blob: <a href='");
+        html(" (");
-        html_attr(cgit_pageurl(ctx.qry.repo, "blob",
+        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
-                               fmt("id=%s&path=%s", sha1_to_hex(sha1), path)));
+                        curr_rev, path);
-        htmlf("'>%s</a>",sha1_to_hex(sha1));
+        htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
        html("<table summary='blob content' class='blob'>\n");
        idx = 0;
        start = 0;
        lineno = 0;
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';
                        htmlf(linefmt, ++lineno);
                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }
        htmlf(linefmt, ++lineno);
        html_txt(buf + start);
        html("</td></tr>\n");
        html("</table>\n");
 }
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                   const char *pathname, unsigned int mode, int stage,
                   void *cbdata)
 {
        char *name;
        char *fullpath;
        enum object_type type;
        unsigned long size = 0;
        name = xstrdup(pathname);
        fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
                       ctx.qry.path ? "/" : "", name);
        if (!S_ISGITLINK(mode)) {
                type = sha1_object_info(sha1, &size);
                if (type == OBJ_BAD) {
                        htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                              name,
                              sha1_to_hex(sha1));
                        return 0;
                }
        }
        html("<tr><td class='ls-mode'>");
        cgit_print_filemode(mode);
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");
                html_attr(fmt(ctx.repo->module_link,
                              name,
                              sha1_to_hex(sha1)));
                html("'>");
                html_txt(name);
                html("</a>");
        } else if (S_ISDIR(mode)) {
                cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                               curr_rev, fullpath);
        } else {
                cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
                      fullpath, 0, NULL, NULL);
        html("</td></tr>\n");
        free(name);
        return 0;
 }
 static void ls_head()
 {
        html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
        html("<th class='left'>Name</th>");
        html("<th class='right'>Size</th>");
        html("<th/>");
        html("</tr>\n");
        header = 1;
 }
 static void ls_tail()
 {
        if (!header)
                return;
        html("</table>\n");
        header = 0;
 }
 static void ls_tree(const unsigned char *sha1, char *path)
 {
        struct tree *tree;
        tree = parse_tree_indirect(sha1);
        if (!tree) {
                cgit_print_error(fmt("Not a tree object: %s",
                                     sha1_to_hex(sha1)));
                return;
        }
        ls_head();
        read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
        ls_tail();
 }
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                     const char *pathname, unsigned mode, int stage,
                     void *cbdata)
 {
        static int state;
        static char buffer[PATH_MAX];
        char *url;
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);
                url = cgit_pageurl(ctx.qry.repo, "tree",
                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
                html("/");
                cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
                               curr_rev, buffer);
                if (strcmp(match_path, buffer))
author	Lars Hjemli <hjemli@gmail.com>	2008-08-06 09:07:13 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2008-08-06 09:21:30 (UTC)
commit	65b7b876aaaf50fc15060533359d6561f4f1819a (patch) (unidiff)
tree	c5cfe73456cf31afb13bcb12c5331fa711f89d71 /ui-tree.c
parent	e5da4bca54574522b28f88cab0dc8ebad9e35a73 (diff)
download	cgit-65b7b876aaaf50fc15060533359d6561f4f1819a.zip cgit-65b7b876aaaf50fc15060533359d6561f4f1819a.tar.gz cgit-65b7b876aaaf50fc15060533359d6561f4f1819a.tar.bz2

diff --git a/ui-tree.c b/ui-tree.c index 9a837e2..79332fc 100644 --- a/ui-tree.c +++ b/ui-tree.c
@@ -1,169 +1,169 @@
1	/* ui-tree.c: functions for tree output	1	/* ui-tree.c: functions for tree output
2	*	2	*
3	* Copyright (C) 2006 Lars Hjemli	3	* Copyright (C) 2006 Lars Hjemli
4	*	4	*
5	* Licensed under GNU General Public License v2	5	* Licensed under GNU General Public License v2
6	* (see COPYING for full license text)	6	* (see COPYING for full license text)
7	*/	7	*/
8		8
9	#include "cgit.h"	9	#include "cgit.h"
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	char *curr_rev;
14	char *match_path;	14	char *match_path;
15	int header = 0;	15	int header = 0;
16		16
17	static void print_object(const unsigned char sha1, char path)	17	static void print_object(const unsigned char sha1, char path)
18	{	18	{
19	enum object_type type;	19	enum object_type type;
20	char *buf;	20	char *buf;
21	unsigned long size, lineno, start, idx;	21	unsigned long size, lineno, start, idx;
22	const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";	22	const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
23		23
24	type = sha1_object_info(sha1, &size);	24	type = sha1_object_info(sha1, &size);
25	if (type == OBJ_BAD) {	25	if (type == OBJ_BAD) {
26	cgit_print_error(fmt("Bad object name: %s",	26	cgit_print_error(fmt("Bad object name: %s",
27	sha1_to_hex(sha1)));	27	sha1_to_hex(sha1)));
28	return;	28	return;
29	}	29	}
30		30
31	buf = read_sha1_file(sha1, &type, &size);	31	buf = read_sha1_file(sha1, &type, &size);
32	if (!buf) {	32	if (!buf) {
33	cgit_print_error(fmt("Error reading object %s",	33	cgit_print_error(fmt("Error reading object %s",
34	sha1_to_hex(sha1)));	34	sha1_to_hex(sha1)));
35	return;	35	return;
36	}	36	}
37		37
38	html(" blob: <a href='");	38	html(" (");
39	html_attr(cgit_pageurl(ctx.qry.repo, "blob",	39	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
40	fmt("id=%s&path=%s", sha1_to_hex(sha1), path)));	40	curr_rev, path);
41	htmlf("'>%s</a>",sha1_to_hex(sha1));	41	htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
42		42
43	html("<table summary='blob content' class='blob'>\n");	43	html("<table summary='blob content' class='blob'>\n");
44	idx = 0;	44	idx = 0;
45	start = 0;	45	start = 0;
46	lineno = 0;	46	lineno = 0;
47	while(idx < size) {	47	while(idx < size) {
48	if (buf[idx] == '\n') {	48	if (buf[idx] == '\n') {
49	buf[idx] = '\0';	49	buf[idx] = '\0';
50	htmlf(linefmt, ++lineno);	50	htmlf(linefmt, ++lineno);
51	html_txt(buf + start);	51	html_txt(buf + start);
52	html("</td></tr>\n");	52	html("</td></tr>\n");
53	start = idx + 1;	53	start = idx + 1;
54	}	54	}
55	idx++;	55	idx++;
56	}	56	}
57	htmlf(linefmt, ++lineno);	57	htmlf(linefmt, ++lineno);
58	html_txt(buf + start);	58	html_txt(buf + start);
59	html("</td></tr>\n");	59	html("</td></tr>\n");
60	html("</table>\n");	60	html("</table>\n");
61	}	61	}
62		62
63		63
64	static int ls_item(const unsigned char sha1, const char base, int baselen,	64	static int ls_item(const unsigned char sha1, const char base, int baselen,
65	const char *pathname, unsigned int mode, int stage,	65	const char *pathname, unsigned int mode, int stage,
66	void *cbdata)	66	void *cbdata)
67	{	67	{
68	char *name;	68	char *name;
69	char *fullpath;	69	char *fullpath;
70	enum object_type type;	70	enum object_type type;
71	unsigned long size = 0;	71	unsigned long size = 0;
72		72
73	name = xstrdup(pathname);	73	name = xstrdup(pathname);
74	fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",	74	fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
75	ctx.qry.path ? "/" : "", name);	75	ctx.qry.path ? "/" : "", name);
76		76
77	if (!S_ISGITLINK(mode)) {	77	if (!S_ISGITLINK(mode)) {
78	type = sha1_object_info(sha1, &size);	78	type = sha1_object_info(sha1, &size);
79	if (type == OBJ_BAD) {	79	if (type == OBJ_BAD) {
80	htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",	80	htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
81	name,	81	name,
82	sha1_to_hex(sha1));	82	sha1_to_hex(sha1));
83	return 0;	83	return 0;
84	}	84	}
85	}	85	}
86		86
87	html("<tr><td class='ls-mode'>");	87	html("<tr><td class='ls-mode'>");
88	cgit_print_filemode(mode);	88	cgit_print_filemode(mode);
89	html("</td><td>");	89	html("</td><td>");
90	if (S_ISGITLINK(mode)) {	90	if (S_ISGITLINK(mode)) {
91	htmlf("<a class='ls-mod' href='");	91	htmlf("<a class='ls-mod' href='");
92	html_attr(fmt(ctx.repo->module_link,	92	html_attr(fmt(ctx.repo->module_link,
93	name,	93	name,
94	sha1_to_hex(sha1)));	94	sha1_to_hex(sha1)));
95	html("'>");	95	html("'>");
96	html_txt(name);	96	html_txt(name);
97	html("</a>");	97	html("</a>");
98	} else if (S_ISDIR(mode)) {	98	} else if (S_ISDIR(mode)) {
99	cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,	99	cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
100	curr_rev, fullpath);	100	curr_rev, fullpath);
101	} else {	101	} else {
102	cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,	102	cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
103	curr_rev, fullpath);	103	curr_rev, fullpath);
104	}	104	}
105	htmlf("</td><td class='ls-size'>%li</td>", size);	105	htmlf("</td><td class='ls-size'>%li</td>", size);
106		106
107	html("<td>");	107	html("<td>");
108	cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,	108	cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
109	fullpath, 0, NULL, NULL);	109	fullpath, 0, NULL, NULL);
110	html("</td></tr>\n");	110	html("</td></tr>\n");
111	free(name);	111	free(name);
112	return 0;	112	return 0;
113	}	113	}
114		114
115	static void ls_head()	115	static void ls_head()
116	{	116	{
117	html("<table summary='tree listing' class='list'>\n");	117	html("<table summary='tree listing' class='list'>\n");
118	html("<tr class='nohover'>");	118	html("<tr class='nohover'>");
119	html("<th class='left'>Mode</th>");	119	html("<th class='left'>Mode</th>");
120	html("<th class='left'>Name</th>");	120	html("<th class='left'>Name</th>");
121	html("<th class='right'>Size</th>");	121	html("<th class='right'>Size</th>");
122	html("<th/>");	122	html("<th/>");
123	html("</tr>\n");	123	html("</tr>\n");
124	header = 1;	124	header = 1;
125	}	125	}
126		126
127	static void ls_tail()	127	static void ls_tail()
128	{	128	{
129	if (!header)	129	if (!header)
130	return;	130	return;
131	html("</table>\n");	131	html("</table>\n");
132	header = 0;	132	header = 0;
133	}	133	}
134		134
135	static void ls_tree(const unsigned char sha1, char path)	135	static void ls_tree(const unsigned char sha1, char path)
136	{	136	{
137	struct tree *tree;	137	struct tree *tree;
138		138
139	tree = parse_tree_indirect(sha1);	139	tree = parse_tree_indirect(sha1);
140	if (!tree) {	140	if (!tree) {
141	cgit_print_error(fmt("Not a tree object: %s",	141	cgit_print_error(fmt("Not a tree object: %s",
142	sha1_to_hex(sha1)));	142	sha1_to_hex(sha1)));
143	return;	143	return;
144	}	144	}
145		145
146	ls_head();	146	ls_head();
147	read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);	147	read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
148	ls_tail();	148	ls_tail();
149	}	149	}
150		150
151		151
152	static int walk_tree(const unsigned char sha1, const char base, int baselen,	152	static int walk_tree(const unsigned char sha1, const char base, int baselen,
153	const char *pathname, unsigned mode, int stage,	153	const char *pathname, unsigned mode, int stage,
154	void *cbdata)	154	void *cbdata)
155	{	155	{
156	static int state;	156	static int state;
157	static char buffer[PATH_MAX];	157	static char buffer[PATH_MAX];
158	char *url;	158	char *url;
159		159
160	if (state == 0) {	160	if (state == 0) {
161	memcpy(buffer, base, baselen);	161	memcpy(buffer, base, baselen);
162	strcpy(buffer+baselen, pathname);	162	strcpy(buffer+baselen, pathname);
163	url = cgit_pageurl(ctx.qry.repo, "tree",	163	url = cgit_pageurl(ctx.qry.repo, "tree",
164	fmt("h=%s&path=%s", curr_rev, buffer));	164	fmt("h=%s&path=%s", curr_rev, buffer));
165	html("/");	165	html("/");
166	cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,	166	cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
167	curr_rev, buffer);	167	curr_rev, buffer);
168		168
169	if (strcmp(match_path, buffer))	169	if (strcmp(match_path, buffer))