Merge branch 'master' of git://git.klever.net/patchwork/cgit

* 'master' of git://git.klever.net/patchwork/cgit:
  allow specification of directly linked blobs mimetypes
  allow blob extract blobs by head/path combination

diff --git a/cgit.c b/cgit.c
index ac882c34ef1ea9baa91cb874f0fb846abcf65824..0deae12d2fd04d911a0772fa2a569c73694ddb08 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -144,6 +144,8 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);
+       } else if (!strcmp(name, "mimetype")) {
+               ctx.qry.mimetype = xstrdup(value);
        }
 }
 

diff --git a/cgit.h b/cgit.h
index 4fa5cf25ed37e515824a67ec5d687d6f2085ba8e..1972d7552afd63be7d5fcbc1f3461ab4b688a971 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -116,6 +116,7 @@ struct cgit_query {
        char *sha2;
        char *path;
        char *name;
+       char *mimetype;
        int   ofs;
 };
 

diff --git a/cmd.c b/cmd.c
index 4edca6bdf5556589e15d8eb7e84400f661eb8426..fe0ea8f4d7e9ae97965236b22d02a76e6aa8baaa 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -32,7 +32,7 @@ static void about_fn(struct cgit_context *ctx)
 
 static void blob_fn(struct cgit_context *ctx)
 {
-       cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
+       cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head);
 }
 
 static void commit_fn(struct cgit_context *ctx)

diff --git a/ui-blob.c b/ui-blob.c
index ab44659a93bb1b66d98ff2bf110de2838e0c39a5..73a8c1d8e0bcf4534df5b08e9dc2e0ef848e533b 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -10,20 +10,49 @@
 #include "html.h"
 #include "ui-shared.h"
 
-void cgit_print_blob(const char *hex, char *path)
+static char *match_path;
+static unsigned char *matched_sha1;
+
+static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) {
+       if(strncmp(base,match_path,baselen)
+               || strcmp(match_path+baselen,pathname) )
+               return READ_TREE_RECURSIVE;
+       memmove(matched_sha1,sha1,20);
+       return 0;
+}
+
+void cgit_print_blob(const char *hex, char *path, const char *head)
 {
 
        unsigned char sha1[20];
        enum object_type type;
        unsigned char *buf;
        unsigned long size;
+       struct commit *commit;
+       const char *paths[] = {path, NULL};
 
-       if (get_sha1_hex(hex, sha1)){
-               cgit_print_error(fmt("Bad hex value: %s", hex));
-               return;
+       if (hex) {
+               if (get_sha1_hex(hex, sha1)){
+                       cgit_print_error(fmt("Bad hex value: %s", hex));
+                       return;
+               }
+       } else {
+               if (get_sha1(head,sha1)) {
+                       cgit_print_error(fmt("Bad ref: %s", head));
+                       return;
+               }
        }
 
        type = sha1_object_info(sha1, &size);
+
+       if((!hex) && type == OBJ_COMMIT && path) {
+               commit = lookup_commit_reference(sha1);
+               match_path = path;
+               matched_sha1 = sha1;
+               read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree);
+               type = sha1_object_info(sha1,&size);
+       }
+
        if (type == OBJ_BAD) {
                cgit_print_error(fmt("Bad object name: %s", hex));
                return;
@@ -36,7 +65,7 @@ void cgit_print_blob(const char *hex, char *path)
        }
 
        buf[size] = '\0';
-       ctx.page.mimetype = NULL;
+       ctx.page.mimetype = ctx.qry.mimetype;
        ctx.page.filename = path;
        cgit_print_http_headers(&ctx);
        write(htmlfd, buf, size);

diff --git a/ui-blob.h b/ui-blob.h
index 5a920a87d27f67fffa022da4ab030c01dd8b8701..dad275aa1e0586b85a4f740178080a5544d355e2 100644 (file)
--- a/ui-blob.h
+++ b/ui-blob.h
@@ -1,6 +1,6 @@
 #ifndef UI_BLOB_H
 #define UI_BLOB_H
 
-extern void cgit_print_blob(const char *hex, char *path);
+extern void cgit_print_blob(const char *hex, char *path, const char *head);
 
 #endif /* UI_BLOB_H */