Add support for downloading single blobs

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

5 files changed, 47 insertions, 3 deletions

diff --git a/Makefile b/Makefileindex 24c39632..7c0527b0 100644--- a/Makefile+++ b/Makefile@@ -9,7 +9,7 @@ CACHE_ROOT = /var/cache/cgit EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/xdiff/lib.a -lz -lcrypto OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 	ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \-	ui-snapshot.o+	ui-snapshot.o ui-blob.o  CFLAGS += -Wall 
diff --git a/Makefile b/Makefile
index 24c39632..7c0527b0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ CACHE_ROOT = /var/cache/cgit
 EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
 	ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \
-	ui-snapshot.o
+	ui-snapshot.o ui-blob.o
 
 CFLAGS += -Wall
 
diff --git a/cgit.c b/cgit.cindex 6dddcbbc..28bab8d2 100644--- a/cgit.c+++ b/cgit.c@@ -79,11 +79,16 @@ static void cgit_print_repo_page(struct cacheitem *item) 	show_search = 0; 	setenv("GIT_DIR", cgit_repo->path, 1); -	if (cgit_repo->snapshots && cgit_query_page && -	    !strcmp(cgit_query_page, "snapshot")) {+	if (cgit_query_page) {+	    if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) { 		cgit_print_snapshot(item, cgit_query_sha1, "zip",  				    cgit_repo->url, cgit_query_name); 		return;+	    }+	    if (!strcmp(cgit_query_page, "blob")) {+		    cgit_print_blob(item, cgit_query_sha1, cgit_query_path);+		    return;+	    } 	}  	if (cgit_query_page && !strcmp(cgit_query_page, "log"))
diff --git a/cgit.c b/cgit.c
index 6dddcbbc..28bab8d2 100644
--- a/cgit.c
+++ b/cgit.c
@@ -79,11 +79,16 @@ static void cgit_print_repo_page(struct cacheitem *item)
 	show_search = 0;
 	setenv("GIT_DIR", cgit_repo->path, 1);
 
-	if (cgit_repo->snapshots && cgit_query_page && 
-	    !strcmp(cgit_query_page, "snapshot")) {
+	if (cgit_query_page) {
+	    if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
 		cgit_print_snapshot(item, cgit_query_sha1, "zip", 
 				    cgit_repo->url, cgit_query_name);
 		return;
+	    }
+	    if (!strcmp(cgit_query_page, "blob")) {
+		    cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+		    return;
+	    }
 	}
 
 	if (cgit_query_page && !strcmp(cgit_query_page, "log"))
diff --git a/cgit.h b/cgit.hindex 26152310..292e488b 100644--- a/cgit.h+++ b/cgit.h@@ -156,6 +156,7 @@ extern void cgit_print_repolist(struct cacheitem *item); extern void cgit_print_summary(); extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep); extern void cgit_print_view(const char *hex, char *path);+extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); extern void cgit_print_tree(const char *hex, char *path); extern void cgit_print_commit(const char *hex); extern void cgit_print_diff(const char *old_hex, const char *new_hex);
diff --git a/cgit.h b/cgit.h
index 26152310..292e488b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -156,6 +156,7 @@ extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep);
 extern void cgit_print_view(const char *hex, char *path);
+extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *hex, char *path);
 extern void cgit_print_commit(const char *hex);
 extern void cgit_print_diff(const char *old_hex, const char *new_hex);
diff --git a/ui-blob.c b/ui-blob.cnew file mode 100644index 00000000..f5b844b6--- /dev/null+++ b/ui-blob.c@@ -0,0 +1,31 @@+#include "cgit.h"++void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)+{++	unsigned char sha1[20];+	enum object_type type;+	unsigned char *buf;+	unsigned long size;++	if (get_sha1_hex(hex, sha1)){+		cgit_print_error(fmt("Bad hex value: %s", hex));+	        return;+	}++	type = sha1_object_info(sha1, &size);+	if (type == OBJ_BAD) {+		cgit_print_error(fmt("Bad object name: %s", hex));+		return;+	}++	buf = read_sha1_file(sha1, &type, &size);+	if (!buf) {+		cgit_print_error(fmt("Error reading object %s", hex));+		return;+	}++	buf[size] = '\0';+	cgit_print_snapshot_start("text/plain", path, item);+	write(htmlfd, buf, size);+}
diff --git a/ui-blob.c b/ui-blob.c
new file mode 100644
index 00000000..f5b844b6
--- /dev/null
+++ b/ui-blob.c
@@ -0,0 +1,31 @@
+#include "cgit.h"
+
+void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
+{
+
+	unsigned char sha1[20];
+	enum object_type type;
+	unsigned char *buf;
+	unsigned long size;
+
+	if (get_sha1_hex(hex, sha1)){
+		cgit_print_error(fmt("Bad hex value: %s", hex));
+	        return;
+	}
+
+	type = sha1_object_info(sha1, &size);
+	if (type == OBJ_BAD) {
+		cgit_print_error(fmt("Bad object name: %s", hex));
+		return;
+	}
+
+	buf = read_sha1_file(sha1, &type, &size);
+	if (!buf) {
+		cgit_print_error(fmt("Error reading object %s", hex));
+		return;
+	}
+
+	buf[size] = '\0';
+	cgit_print_snapshot_start("text/plain", path, item);
+	write(htmlfd, buf, size);
+}
diff --git a/ui-view.c b/ui-view.cindex 7d022fdf..dbe4b29d 100644--- a/ui-view.c+++ b/ui-view.c@@ -40,6 +40,13 @@ void cgit_print_view(const char *hex, char *path) 	htmlf("%s %s, %li bytes", typename(type), hex, size); 	if (path) 		html(")");++	html(" <a href='");+	html_attr(cgit_pageurl(cgit_query_repo, "blob", +			       fmt("id=%s&path=%s", +				   hex,+				   path)));+	html("'>download</a>"); 	html("</th></tr>\n"); 	html("<tr><td class='blob'>\n"); 	html_txt(buf);
diff --git a/ui-view.c b/ui-view.c
index 7d022fdf..dbe4b29d 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -40,6 +40,13 @@ void cgit_print_view(const char *hex, char *path)
 	htmlf("%s %s, %li bytes", typename(type), hex, size);
 	if (path)
 		html(")");
+
+	html(" <a href='");
+	html_attr(cgit_pageurl(cgit_query_repo, "blob", 
+			       fmt("id=%s&path=%s", 
+				   hex,
+				   path)));
+	html("'>download</a>");
 	html("</th></tr>\n");
 	html("<tr><td class='blob'>\n");
 	html_txt(buf);