summaryrefslogtreecommitdiffabout
authorMartin Szulecki <opensuse@sukimashita.com>2009-08-07 12:06:02 (UTC)
committer Martin Szulecki <opensuse@sukimashita.com>2009-08-08 12:23:34 (UTC)
commitb4c3562f57c924866314d0f80f46dddecd4ce61a (patch) (unidiff)
treea720b48fa2f32458b6d1a80808f329cc90e233fe
parent2f56e390f04fe6975b75e512c1436ef173e4aafe (diff)
downloadcgit-b4c3562f57c924866314d0f80f46dddecd4ce61a.zip
cgit-b4c3562f57c924866314d0f80f46dddecd4ce61a.tar.gz
cgit-b4c3562f57c924866314d0f80f46dddecd4ce61a.tar.bz2
Expose file extension in tree lists as class to allow nicer tree styling
Signed-off-by: Martin Szulecki <opensuse@sukimashita.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tree.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 553dbaa..61fcf5a 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -58,129 +58,135 @@ static void print_binary_buffer(char *buf, unsigned long size)
58 html(" </td><td class='hex'>"); 58 html(" </td><td class='hex'>");
59 for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++) 59 for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
60 ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.'; 60 ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.';
61 ascii[idx] = '\0'; 61 ascii[idx] = '\0';
62 html_txt(ascii); 62 html_txt(ascii);
63 html("</td></tr>\n"); 63 html("</td></tr>\n");
64 } 64 }
65 html("</table>\n"); 65 html("</table>\n");
66} 66}
67 67
68static void print_object(const unsigned char *sha1, char *path) 68static void print_object(const unsigned char *sha1, char *path)
69{ 69{
70 enum object_type type; 70 enum object_type type;
71 char *buf; 71 char *buf;
72 unsigned long size; 72 unsigned long size;
73 73
74 type = sha1_object_info(sha1, &size); 74 type = sha1_object_info(sha1, &size);
75 if (type == OBJ_BAD) { 75 if (type == OBJ_BAD) {
76 cgit_print_error(fmt("Bad object name: %s", 76 cgit_print_error(fmt("Bad object name: %s",
77 sha1_to_hex(sha1))); 77 sha1_to_hex(sha1)));
78 return; 78 return;
79 } 79 }
80 80
81 buf = read_sha1_file(sha1, &type, &size); 81 buf = read_sha1_file(sha1, &type, &size);
82 if (!buf) { 82 if (!buf) {
83 cgit_print_error(fmt("Error reading object %s", 83 cgit_print_error(fmt("Error reading object %s",
84 sha1_to_hex(sha1))); 84 sha1_to_hex(sha1)));
85 return; 85 return;
86 } 86 }
87 87
88 html(" ("); 88 html(" (");
89 cgit_plain_link("plain", NULL, NULL, ctx.qry.head, 89 cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
90 curr_rev, path); 90 curr_rev, path);
91 htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); 91 htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
92 92
93 if (buffer_is_binary(buf, size)) 93 if (buffer_is_binary(buf, size))
94 print_binary_buffer(buf, size); 94 print_binary_buffer(buf, size);
95 else 95 else
96 print_text_buffer(buf, size); 96 print_text_buffer(buf, size);
97} 97}
98 98
99 99
100static int ls_item(const unsigned char *sha1, const char *base, int baselen, 100static int ls_item(const unsigned char *sha1, const char *base, int baselen,
101 const char *pathname, unsigned int mode, int stage, 101 const char *pathname, unsigned int mode, int stage,
102 void *cbdata) 102 void *cbdata)
103{ 103{
104 char *name; 104 char *name;
105 char *fullpath; 105 char *fullpath;
106 char *class;
106 enum object_type type; 107 enum object_type type;
107 unsigned long size = 0; 108 unsigned long size = 0;
108 109
109 name = xstrdup(pathname); 110 name = xstrdup(pathname);
110 fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "", 111 fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
111 ctx.qry.path ? "/" : "", name); 112 ctx.qry.path ? "/" : "", name);
112 113
113 if (!S_ISGITLINK(mode)) { 114 if (!S_ISGITLINK(mode)) {
114 type = sha1_object_info(sha1, &size); 115 type = sha1_object_info(sha1, &size);
115 if (type == OBJ_BAD) { 116 if (type == OBJ_BAD) {
116 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", 117 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
117 name, 118 name,
118 sha1_to_hex(sha1)); 119 sha1_to_hex(sha1));
119 return 0; 120 return 0;
120 } 121 }
121 } 122 }
122 123
123 html("<tr><td class='ls-mode'>"); 124 html("<tr><td class='ls-mode'>");
124 cgit_print_filemode(mode); 125 cgit_print_filemode(mode);
125 html("</td><td>"); 126 html("</td><td>");
126 if (S_ISGITLINK(mode)) { 127 if (S_ISGITLINK(mode)) {
127 htmlf("<a class='ls-mod' href='"); 128 htmlf("<a class='ls-mod' href='");
128 html_attr(fmt(ctx.repo->module_link, 129 html_attr(fmt(ctx.repo->module_link,
129 name, 130 name,
130 sha1_to_hex(sha1))); 131 sha1_to_hex(sha1)));
131 html("'>"); 132 html("'>");
132 html_txt(name); 133 html_txt(name);
133 html("</a>"); 134 html("</a>");
134 } else if (S_ISDIR(mode)) { 135 } else if (S_ISDIR(mode)) {
135 cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, 136 cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
136 curr_rev, fullpath); 137 curr_rev, fullpath);
137 } else { 138 } else {
138 cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, 139 class = strrchr(name, '.');
140 if (class != NULL) {
141 class = fmt("ls-blob %s", class + 1);
142 } else
143 class = "ls-blob";
144 cgit_tree_link(name, NULL, class, ctx.qry.head,
139 curr_rev, fullpath); 145 curr_rev, fullpath);
140 } 146 }
141 htmlf("</td><td class='ls-size'>%li</td>", size); 147 htmlf("</td><td class='ls-size'>%li</td>", size);
142 148
143 html("<td>"); 149 html("<td>");
144 cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, 150 cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
145 fullpath, 0, NULL, NULL, ctx.qry.showmsg); 151 fullpath, 0, NULL, NULL, ctx.qry.showmsg);
146 if (ctx.repo->max_stats) 152 if (ctx.repo->max_stats)
147 cgit_stats_link("stats", NULL, "button", ctx.qry.head, 153 cgit_stats_link("stats", NULL, "button", ctx.qry.head,
148 fullpath); 154 fullpath);
149 html("</td></tr>\n"); 155 html("</td></tr>\n");
150 free(name); 156 free(name);
151 return 0; 157 return 0;
152} 158}
153 159
154static void ls_head() 160static void ls_head()
155{ 161{
156 html("<table summary='tree listing' class='list'>\n"); 162 html("<table summary='tree listing' class='list'>\n");
157 html("<tr class='nohover'>"); 163 html("<tr class='nohover'>");
158 html("<th class='left'>Mode</th>"); 164 html("<th class='left'>Mode</th>");
159 html("<th class='left'>Name</th>"); 165 html("<th class='left'>Name</th>");
160 html("<th class='right'>Size</th>"); 166 html("<th class='right'>Size</th>");
161 html("<th/>"); 167 html("<th/>");
162 html("</tr>\n"); 168 html("</tr>\n");
163 header = 1; 169 header = 1;
164} 170}
165 171
166static void ls_tail() 172static void ls_tail()
167{ 173{
168 if (!header) 174 if (!header)
169 return; 175 return;
170 html("</table>\n"); 176 html("</table>\n");
171 header = 0; 177 header = 0;
172} 178}
173 179
174static void ls_tree(const unsigned char *sha1, char *path) 180static void ls_tree(const unsigned char *sha1, char *path)
175{ 181{
176 struct tree *tree; 182 struct tree *tree;
177 183
178 tree = parse_tree_indirect(sha1); 184 tree = parse_tree_indirect(sha1);
179 if (!tree) { 185 if (!tree) {
180 cgit_print_error(fmt("Not a tree object: %s", 186 cgit_print_error(fmt("Not a tree object: %s",
181 sha1_to_hex(sha1))); 187 sha1_to_hex(sha1)));
182 return; 188 return;
183 } 189 }
184 190
185 ls_head(); 191 ls_head();
186 read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL); 192 read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);