add support for snapshot tarballs

- reworked cgit_print_snapshot to use a list of supported archivers and pick
	one for the suffix supplied
- moved printing of snaphot links into ui-snapshot and make it iterate through
	the said list
lh/pretty-blob-view
Michael Krelin 17 years ago
parent 71ebcbe23a
commit f97c707a3b

@ -68,7 +68,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
setenv("GIT_DIR", cgit_repo->path, 1); setenv("GIT_DIR", cgit_repo->path, 1);
if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
cgit_print_snapshot(item, cgit_query_sha1, "zip", cgit_print_snapshot(item, cgit_query_sha1,
cgit_repo->url, cgit_query_name); cgit_repo->url, cgit_query_name);
return; return;
} }

@ -230,7 +230,7 @@ extern void cgit_print_tree(const char *rev, char *path);
extern void cgit_print_commit(char *hex); extern void cgit_print_commit(char *hex);
extern void cgit_print_diff(const char *new_hex, const char *old_hex); extern void cgit_print_diff(const char *new_hex, const char *old_hex);
extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
const char *format, const char *prefix, const char *prefix, const char *filename);
const char *filename); extern void cgit_print_snapshot_links(const char *repo, const char *hex);
#endif /* CGIT_H */ #endif /* CGIT_H */

@ -139,7 +139,6 @@ void cgit_print_commit(char *hex)
struct commitinfo *info; struct commitinfo *info;
struct commit_list *p; struct commit_list *p;
unsigned char sha1[20]; unsigned char sha1[20];
char *filename;
char *tmp; char *tmp;
int i; int i;
@ -196,11 +195,9 @@ void cgit_print_commit(char *hex)
html(")</td></tr>"); html(")</td></tr>");
} }
if (cgit_repo->snapshots) { if (cgit_repo->snapshots) {
htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); html("<tr><th>download</th><td colspan='2' class='sha1'>");
filename = fmt("%s-%s.zip", cgit_query_repo, hex); cgit_print_snapshot_links(cgit_query_repo,hex);
html_attr(cgit_pageurl(cgit_query_repo, "snapshot", html("</td></tr>");
fmt("id=%s&amp;name=%s", hex, filename)));
htmlf("'>%s</a></td></tr>", filename);
} }
html("</table>\n"); html("</table>\n");
html("<div class='commit-subject'>"); html("<div class='commit-subject'>");

@ -8,40 +8,61 @@
#include "cgit.h" #include "cgit.h"
static void cgit_print_zip(struct cacheitem *item, const char *hex, static const struct snapshot_archive_t {
const char *prefix, const char *filename) const char *suffix;
const char *mimetype;
write_archive_fn_t write_func;
} snapshot_archives[] = {
{ ".zip", "application/x-zip", write_zip_archive },
{ ".tar.gz", "application/x-gzip", write_tar_archive }
};
void cgit_print_snapshot(struct cacheitem *item, const char *hex,
const char *prefix, const char *filename)
{ {
struct archiver_args args; int fnl = strlen(filename);
struct commit *commit; int f;
unsigned char sha1[20]; for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
const struct snapshot_archive_t* sat = &snapshot_archives[f];
int sl = strlen(sat->suffix);
if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
continue;
if (get_sha1(hex, sha1)) { struct archiver_args args;
cgit_print_error(fmt("Bad object id: %s", hex)); struct commit *commit;
return; unsigned char sha1[20];
}
commit = lookup_commit_reference(sha1); if(get_sha1(hex, sha1)) {
cgit_print_error(fmt("Bad object id: %s", hex));
return;
}
commit = lookup_commit_reference(sha1);
if(!commit) {
cgit_print_error(fmt("Not a commit reference: %s", hex));
return;;
}
if (!commit) { memset(&args,0,sizeof(args));
cgit_print_error(fmt("Not a commit reference: %s", hex)); args.base = fmt("%s/", prefix);
args.tree = commit->tree;
cgit_print_snapshot_start(sat->mimetype, filename, item);
(*sat->write_func)(&args);
return; return;
} }
cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
memset(&args, 0, sizeof(args));
args.base = fmt("%s/", prefix);
args.tree = commit->tree;
cgit_print_snapshot_start("application/x-zip", filename, item);
write_zip_archive(&args);
} }
void cgit_print_snapshot_links(const char *repo,const char *hex)
void cgit_print_snapshot(struct cacheitem *item, const char *hex,
const char *format, const char *prefix,
const char *filename)
{ {
if (!strcmp(format, "zip")) char *filename;
cgit_print_zip(item, hex, prefix, filename); int f;
else for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
cgit_print_error(fmt("Unsupported snapshot format: %s", const struct snapshot_archive_t* sat = &snapshot_archives[f];
format)); filename = fmt("%s-%s%s",repo,hex,sat->suffix);
htmlf("<a href='%s'>%s</a><br/>",
cgit_pageurl(repo,"snapshot",
fmt("id=%s&amp;name=%s",hex,filename)), filename);
}
} }

Loading…
Cancel
Save