diff options
author | Michael Krelin <hacker@klever.net> | 2007-07-18 14:40:03 +0200 |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-18 14:40:03 +0200 |
commit | f97c707a3b975d32910331f72783ec3044e3c0ee (patch) | |
tree | 632239a8a644036bd08fbb6f202278de068097b5 /ui-snapshot.c | |
parent | 71ebcbe23ab548e5c0ad40aa8be5741654ed3201 (diff) | |
download | cgit-f97c707a3b975d32910331f72783ec3044e3c0ee.tar.gz cgit-f97c707a3b975d32910331f72783ec3044e3c0ee.tar.bz2 cgit-f97c707a3b975d32910331f72783ec3044e3c0ee.zip |
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
Diffstat (limited to '')
-rw-r--r-- | ui-snapshot.c | 77 |
1 files changed, 49 insertions, 28 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 2257d6b..eb5f1cd 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -8,40 +8,61 @@ #include "cgit.h" -static void cgit_print_zip(struct cacheitem *item, const char *hex, - const char *prefix, const char *filename) +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) { - struct archiver_args args; - struct commit *commit; - unsigned char sha1[20]; + 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; - if (get_sha1(hex, sha1)) { - cgit_print_error(fmt("Bad object id: %s", hex)); - return; - } - commit = lookup_commit_reference(sha1); + 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;; + } - if (!commit) { - cgit_print_error(fmt("Not a commit reference: %s", hex)); + memset(&args,0,sizeof(args)); + args.base = fmt("%s/", prefix); + args.tree = commit->tree; + + cgit_print_snapshot_start(sat->mimetype, filename, item); + (*sat->write_func)(&args); return; } - - 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); + cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); } - -void cgit_print_snapshot(struct cacheitem *item, const char *hex, - const char *format, const char *prefix, - const char *filename) +void cgit_print_snapshot_links(const char *repo,const char *hex) { - if (!strcmp(format, "zip")) - cgit_print_zip(item, hex, prefix, filename); - else - cgit_print_error(fmt("Unsupported snapshot format: %s", - format)); + 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); + } } |