ui_plain: automatically lookup mimetype when mimetype-file is set

[cgit.git] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 1b2b67297b215ef632ebd0d36bd9cef413e4dee2..7fecc32e1a970fdb3c51575e44072036222718d2 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -6,6 +6,7 @@
  *   (see COPYING for full license text)
  */
 
  *   (see COPYING for full license text)
  */
 

+#include <stdio.h>

 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"


@@ -13,12 +14,53 @@
 int match_baselen;
 int match;
 
 int match_baselen;
 int match;
 

+static char *get_mimetype_from_file(const char *filename, const char *ext)
+{
+       static const char *delimiters;
+       char *result;
+       FILE *fd;
+       char line[1024];
+       char *mimetype;
+       char *token;
+
+       if (!filename)
+               return NULL;
+
+       fd = fopen(filename, "r");
+       if (!fd)
+               return NULL;
+
+       delimiters = " \t\r\n";
+       result = NULL;
+
+       /* loop over all lines in the file */
+       while (!result && fgets(line, sizeof(line), fd)) {
+               mimetype = strtok(line, delimiters);
+
+               /* skip empty lines and comment lines */
+               if (!mimetype || (mimetype[0] == '#'))
+                       continue;
+
+               /* loop over all extensions of mimetype */
+               while ((token = strtok(NULL, delimiters))) {
+                       if (!strcasecmp(ext, token)) {
+                               result = xstrdup(mimetype);
+                               break;
+                       }
+               }
+       }
+       fclose(fd);
+
+       return result;
+}
+

 static void print_object(const unsigned char *sha1, const char *path)
 {
        enum object_type type;
        char *buf, *ext;
        unsigned long size;
        struct string_list_item *mime;
 static void print_object(const unsigned char *sha1, const char *path)
 {
        enum object_type type;
        char *buf, *ext;
        unsigned long size;
        struct string_list_item *mime;

+       int freemime;

 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {


@@ -33,10 +75,16 @@ static void print_object(const unsigned char *sha1, const char *path)
        }
        ctx.page.mimetype = NULL;
        ext = strrchr(path, '.');
        }
        ctx.page.mimetype = NULL;
        ext = strrchr(path, '.');

+       freemime = 0;

        if (ext && *(++ext)) {
                mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
        if (ext && *(++ext)) {
                mime = string_list_lookup(&ctx.cfg.mimetypes, ext);

-               if (mime)
+               if (mime) {

                        ctx.page.mimetype = (char *)mime->util;
                        ctx.page.mimetype = (char *)mime->util;

+               } else {
+                       ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
+                       if (ctx.page.mimetype)
+                               freemime = 1;
+               }

        }
        if (!ctx.page.mimetype) {
                if (buffer_is_binary(buf, size))
        }
        if (!ctx.page.mimetype) {
                if (buffer_is_binary(buf, size))


@@ -50,32 +98,61 @@ static void print_object(const unsigned char *sha1, const char *path)
        cgit_print_http_headers(&ctx);
        html_raw(buf, size);
        match = 1;
        cgit_print_http_headers(&ctx);
        html_raw(buf, size);
        match = 1;

+       if (freemime)
+               free(ctx.page.mimetype);

 }
 
 }
 

-static void print_dir(const unsigned char *sha1, const char *path,
-                     const char *base)
+static char *buildpath(const char *base, int baselen, const char *path)

 {
 {

-       char *fullpath;
-       if (path[0] || base[0])
-               fullpath = fmt("/%s%s/", base, path);
+       if (path[0])
+               return fmt("%.*s%s/", baselen, base, path);

        else
        else

-               fullpath = "/";
+               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);
        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");
+       htmlf("<html><head><title>%s", slash);
+       html_txt(fullpath);
+       htmlf("</title></head>\n<body>\n<h2>%s", slash);
+       html_txt(fullpath);
+       html("</h2>\n<ul>\n");
+       len = strlen(fullpath);
+       if (len > 1) {
+               fullpath[len - 1] = 0;
+               slash = strrchr(fullpath, '/');
+               if (slash)
+                       *(slash + 1) = 0;
+               else
+                       fullpath = NULL;
+               html("<li>");
+               cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                               fullpath);
+               html("</li>\n");
+       }

        match = 2;
 }
 
        match = 2;
 }
 

-static void print_dir_entry(const unsigned char *sha1, const char *path,
-                           unsigned mode)
+static void print_dir_entry(const unsigned char *sha1, const char *base,
+                           int baselen, 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);
+       char *fullpath;
+
+       fullpath = buildpath(base, baselen, path);
+       if (!S_ISDIR(mode))
+               fullpath[strlen(fullpath) - 1] = 0;
+       html("  <li>");
+       cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                       fullpath);
+       html("</li>\n");

        match = 2;
 }
 
        match = 2;
 }
 


@@ -92,12 +169,12 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                if (S_ISREG(mode))
                        print_object(sha1, pathname);
                else if (S_ISDIR(mode)) {
                if (S_ISREG(mode))
                        print_object(sha1, pathname);
                else if (S_ISDIR(mode)) {

-                       print_dir(sha1, pathname, base);
+                       print_dir(sha1, base, baselen, pathname);

                        return READ_TREE_RECURSIVE;
                }
        }
        else if (baselen > match_baselen)
                        return READ_TREE_RECURSIVE;
                }
        }
        else if (baselen > match_baselen)

-               print_dir_entry(sha1, pathname, mode);
+               print_dir_entry(sha1, base, baselen, pathname, mode);

        else if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
 
        else if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
 


@@ -134,7 +211,7 @@ void cgit_print_plain(struct cgit_context *ctx)
        if (!paths[0]) {
                paths[0] = "";
                match_baselen = -1;
        if (!paths[0]) {
                paths[0] = "";
                match_baselen = -1;

-               print_dir(commit->tree->object.sha1, "", "");
+               print_dir(commit->tree->object.sha1, "", 0, "");

        }
        else
                match_baselen = basedir_len(paths[0]);
        }
        else
                match_baselen = basedir_len(paths[0]);