X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/bdd4a56ad55720cde3b7b290b6b9fe4c57dc4f01..7f88d20823ad9d375900657334bc27793860f6ee:/ui-plain.c
diff --git a/ui-plain.c b/ui-plain.c
index 5addd9e..733db4d 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -10,15 +10,15 @@
#include "html.h"
#include "ui-shared.h"
-char *curr_rev;
-char *match_path;
+int match_baselen;
int match;
static void print_object(const unsigned char *sha1, const char *path)
{
enum object_type type;
- char *buf;
+ char *buf, *ext;
unsigned long size;
+ struct string_list_item *mime;
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
@@ -31,24 +31,111 @@ static void print_object(const unsigned char *sha1, const char *path)
html_status(404, "Not found", 0);
return;
}
- ctx.page.mimetype = "text/plain";
+ ctx.page.mimetype = NULL;
+ ext = strrchr(path, '.');
+ if (ext && *(++ext)) {
+ mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
+ if (mime)
+ ctx.page.mimetype = (char *)mime->util;
+ }
+ if (!ctx.page.mimetype) {
+ if (buffer_is_binary(buf, size))
+ ctx.page.mimetype = "application/octet-stream";
+ else
+ ctx.page.mimetype = "text/plain";
+ }
ctx.page.filename = fmt("%s", path);
ctx.page.size = size;
+ ctx.page.etag = sha1_to_hex(sha1);
cgit_print_http_headers(&ctx);
html_raw(buf, size);
match = 1;
}
+static char *buildpath(const char *base, int baselen, const char *path)
+{
+ if (path[0])
+ return fmt("%.*s%s/", baselen, base, path);
+ else
+ return fmt("%.*s/", baselen, base);
+}
+
+static void print_dir(const unsigned char *sha1, const char *base,
+ int baselen, const char *path)
+{
+ char *fullpath, *slash;
+ size_t len;
+
+ fullpath = buildpath(base, baselen, path);
+ slash = (fullpath[0] == '/' ? "" : "/");
+ ctx.page.etag = sha1_to_hex(sha1);
+ cgit_print_http_headers(&ctx);
+ htmlf("%s", slash);
+ html_txt(fullpath);
+ htmlf("\n\n%s", slash);
+ html_txt(fullpath);
+ html("
\n\n");
+ len = strlen(fullpath);
+ if (len > 1) {
+ fullpath[len - 1] = 0;
+ slash = strrchr(fullpath, '/');
+ if (slash)
+ *(slash + 1) = 0;
+ else
+ fullpath = NULL;
+ html("- ");
+ cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ fullpath);
+ html("
\n");
+ }
+ match = 2;
+}
+
+static void print_dir_entry(const unsigned char *sha1, const char *base,
+ int baselen, const char *path, unsigned mode)
+{
+ char *fullpath;
+
+ fullpath = buildpath(base, baselen, path);
+ if (!S_ISDIR(mode))
+ fullpath[strlen(fullpath) - 1] = 0;
+ html(" - ");
+ cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ fullpath);
+ html("
\n");
+ match = 2;
+}
+
+static void print_dir_tail(void)
+{
+ html("
\n\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, base, baselen, pathname);
+ return READ_TREE_RECURSIVE;
+ }
+ }
+ else if (baselen > match_baselen)
+ print_dir_entry(sha1, base, baselen, pathname, mode);
+ else if (S_ISDIR(mode))
return READ_TREE_RECURSIVE;
- if (S_ISREG(mode))
- print_object(sha1, pathname);
+ return 0;
+}
+static int basedir_len(const char *path)
+{
+ char *p = strrchr(path, '/');
+ if (p)
+ return p - path + 1;
return 0;
}
@@ -62,7 +149,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;
@@ -72,8 +158,16 @@ void cgit_print_plain(struct cgit_context *ctx)
html_status(404, "Not found", 0);
return;
}
- match_path = ctx->qry.path;
- read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
+ if (!paths[0]) {
+ paths[0] = "";
+ match_baselen = -1;
+ print_dir(commit->tree->object.sha1, "", 0, "");
+ }
+ 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();
}