X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/0df096f6e146187e55e2203ea1c017442cc2c8c6..d529c6fbdca7ce3782e75b3a74baad21ef2f92c3:/ui-snapshot.c diff --git a/ui-snapshot.c b/ui-snapshot.c index 7076b50..9c4d086 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -7,6 +7,8 @@ */ #include "cgit.h" +#include "html.h" +#include "ui-shared.h" static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) { @@ -30,7 +32,7 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f /* parent */ chk_zero(close(rw[0]), "Closing read end of pipe"); chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); - + rv = write_tar_archive(args); chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); @@ -48,69 +50,139 @@ static int write_tar_gzip_archive(struct archiver_args *args) { return write_compressed_tar_archive(args,"gzip"); } + static int write_tar_bzip2_archive(struct archiver_args *args) { return write_compressed_tar_archive(args,"bzip2"); } -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-tar", write_tar_gzip_archive }, - { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }, - { ".tar", "application/x-tar", write_tar_archive } +const struct cgit_snapshot_format cgit_snapshot_formats[] = { + { ".zip", "application/x-zip", write_zip_archive, 0x1 }, + { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, + { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, + { ".tar", "application/x-tar", write_tar_archive, 0x8 }, + {} }; -void cgit_print_snapshot(struct cacheitem *item, const char *hex, - const char *prefix, const char *filename) +static const struct cgit_snapshot_format *get_format(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(fnlsuffix)) - continue; - - struct archiver_args args; - struct commit *commit; - unsigned char sha1[20]; + const struct cgit_snapshot_format *fmt; + int fl, sl; - if(get_sha1(hex, sha1)) { - cgit_print_error(fmt("Bad object id: %s", hex)); - return; - } - commit = lookup_commit_reference(sha1); + fl = strlen(filename); + for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { + sl = strlen(fmt->suffix); + if (sl >= fl) + continue; + if (!strcmp(fmt->suffix, filename + fl - sl)) + return fmt; + } + return NULL; +} - if(!commit) { - cgit_print_error(fmt("Not a commit reference: %s", hex)); - return;; - } +static int make_snapshot(const struct cgit_snapshot_format *format, + const char *hex, const char *prefix, + const char *filename) +{ + struct archiver_args args; + struct commit *commit; + unsigned char sha1[20]; - memset(&args,0,sizeof(args)); + if(get_sha1(hex, sha1)) { + cgit_print_error(fmt("Bad object id: %s", hex)); + return 1; + } + commit = lookup_commit_reference(sha1); + if(!commit) { + cgit_print_error(fmt("Not a commit reference: %s", hex)); + return 1; + } + memset(&args, 0, sizeof(args)); + if (prefix) { args.base = fmt("%s/", prefix); - args.tree = commit->tree; + args.baselen = strlen(prefix) + 1; + } else { + args.base = ""; + args.baselen = 0; + } + args.tree = commit->tree; + args.time = commit->date; + ctx.page.mimetype = xstrdup(format->mimetype); + ctx.page.filename = xstrdup(filename); + cgit_print_http_headers(&ctx); + format->write_func(&args); + return 0; +} - cgit_print_snapshot_start(sat->mimetype, filename, item); - (*sat->write_func)(&args); - return; +char *dwim_filename = NULL; +const char *dwim_refname = NULL; + +static int ref_cb(const char *refname, const unsigned char *sha1, int flags, + void *cb_data) +{ + const char *r = refname; + while (r && *r) { + fprintf(stderr, " cmp %s with %s:", dwim_filename, r); + if (!strcmp(dwim_filename, r)) { + fprintf(stderr, "MATCH!\n"); + dwim_refname = refname; + return 1; + } + fprintf(stderr, "no match\n"); + if (isdigit(*r)) + break; + r++; } - cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); + return 0; } -void cgit_print_snapshot_links(const char *repo,const char *hex) +/* Try to guess the requested revision by combining repo name and tag name + * and comparing this to the requested snapshot name. E.g. the requested + * snapshot is "cgit-0.7.2.tar.gz" while repo name is "cgit" and tag name + * is "v0.7.2". First, the reponame is stripped off, leaving "-0.7.2.tar.gz". + * Next, any '-' and '_' characters are stripped, leaving "0.7.2.tar.gz". + * Finally, the requested format suffix is removed and we end up with "0.7.2". + * Then we test each tag against this dwimmed filename, and for each tag + * we even try to remove any leading characters which are non-digits. I.e. + * we first compare with "v0.7.2", then with "0.7.2" and we've got a match. + */ +static const char *get_ref_from_filename(const char *url, const char *filename, + const struct cgit_snapshot_format *fmt) { - 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("%s
", - cgit_fileurl(repo,"snapshot",filename, - fmt("id=%s&name=%s",hex,filename)), filename); + const char *reponame = cgit_repobasename(url); + fprintf(stderr, "reponame=%s, filename=%s\n", reponame, filename); + if (prefixcmp(filename, reponame)) + return NULL; + filename += strlen(reponame); + while (filename && (*filename == '-' || *filename == '_')) + filename++; + dwim_filename = xstrdup(filename); + dwim_filename[strlen(filename) - strlen(fmt->suffix)] = '\0'; + for_each_tag_ref(ref_cb, NULL); + return dwim_refname; +} + +void cgit_print_snapshot(const char *head, const char *hex, const char *prefix, + const char *filename, int snapshots, int dwim) +{ + const struct cgit_snapshot_format* f; + + f = get_format(filename); + if (!f) { + ctx.page.mimetype = "text/html"; + cgit_print_http_headers(&ctx); + cgit_print_docstart(&ctx); + cgit_print_pageheader(&ctx); + cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); + cgit_print_docend(); + return; } + + if (!hex && dwim) + hex = get_ref_from_filename(ctx.repo->url, filename, f); + + if (!hex) + hex = head; + + make_snapshot(f, hex, prefix, filename); } -/* vim:set sw=8: */