| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | cgit.h | 4 | ||||
| -rw-r--r-- | ui-commit.c | 9 | ||||
| -rw-r--r-- | ui-snapshot.c | 77 |
4 files changed, 37 insertions, 55 deletions
@@ -68,7 +68,7 @@ static void cgit_print_repo_page(struct cacheitem *item) setenv("GIT_DIR", cgit_repo->path, 1); if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { - cgit_print_snapshot(item, cgit_query_sha1, + cgit_print_snapshot(item, cgit_query_sha1, "zip", cgit_repo->url, cgit_query_name); 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_diff(const char *new_hex, const char *old_hex); extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, - const char *prefix, const char *filename); -extern void cgit_print_snapshot_links(const char *repo, const char *hex); + const char *format, const char *prefix, + const char *filename); #endif /* CGIT_H */ diff --git a/ui-commit.c b/ui-commit.c index bf5e6dc..2679b59 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -139,6 +139,7 @@ void cgit_print_commit(char *hex) struct commitinfo *info; struct commit_list *p; unsigned char sha1[20]; + char *filename; char *tmp; int i; @@ -195,9 +196,11 @@ void cgit_print_commit(char *hex) html(")</td></tr>"); } if (cgit_repo->snapshots) { - html("<tr><th>download</th><td colspan='2' class='sha1'>"); - cgit_print_snapshot_links(cgit_query_repo,hex); - html("</td></tr>"); + htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); + filename = fmt("%s-%s.zip", cgit_query_repo, hex); + html_attr(cgit_pageurl(cgit_query_repo, "snapshot", + fmt("id=%s&name=%s", hex, filename))); + htmlf("'>%s</a></td></tr>", filename); } html("</table>\n"); html("<div class='commit-subject'>"); diff --git a/ui-snapshot.c b/ui-snapshot.c index eb5f1cd..2257d6b 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -8,61 +8,40 @@ #include "cgit.h" -static const struct snapshot_archive_t { - 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) +static void cgit_print_zip(struct cacheitem *item, const char *hex, + const char *prefix, const char *filename) { - int fnl = strlen(filename); - int f; - 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; - - struct archiver_args args; - struct commit *commit; - unsigned char sha1[20]; + struct archiver_args args; + struct commit *commit; + unsigned char sha1[20]; - 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;; - } - - memset(&args,0,sizeof(args)); - args.base = fmt("%s/", prefix); - args.tree = commit->tree; + if (get_sha1(hex, sha1)) { + cgit_print_error(fmt("Bad object id: %s", hex)); + return; + } + commit = lookup_commit_reference(sha1); - cgit_print_snapshot_start(sat->mimetype, filename, item); - (*sat->write_func)(&args); + if (!commit) { + cgit_print_error(fmt("Not a commit reference: %s", hex)); 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) { - char *filename; - int f; - for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { - const struct snapshot_archive_t* sat = &snapshot_archives[f]; - filename = fmt("%s-%s%s",repo,hex,sat->suffix); - htmlf("<a href='%s'>%s</a><br/>", - cgit_pageurl(repo,"snapshot", - fmt("id=%s&name=%s",hex,filename)), filename); - } + if (!strcmp(format, "zip")) + cgit_print_zip(item, hex, prefix, filename); + else + cgit_print_error(fmt("Unsupported snapshot format: %s", + format)); } |