ui-plain: more efficient walk_tree()

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index e08b15be1a85e46532623868640a49aea2a7f384..8b0badd2c6554993db04c2b5cc4b7104d90ff1fa 100644 (file)
--- 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,9 +31,22 @@ 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(ext, &ctx.cfg.mimetypes);
+               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;
@@ -43,13 +56,21 @@ 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))
                return READ_TREE_RECURSIVE;
 
-       if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
-           !strcmp(pathname, match_path + baselen))
-               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;
 }
 
@@ -63,7 +84,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;
@@ -73,8 +93,8 @@ 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);
+       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);
 }