cache.c: use xread()/xwrite() from libgit

[cgit.git] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index d6be55b01e5e75ee63d760c53adb12bf6fa91be6..966a14007414f35d0e04f862a593c93ba26421b5 100644 (file)
--- 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,98 +50,65 @@ 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;
-       int bit;
-}      snapshot_archives[] = {
+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 }
+       { ".tar", "application/x-tar", write_tar_archive, 0x8 },
+       {}
 };
 
-void cgit_print_snapshot(struct cacheitem *item, const char *hex, 
-                        const char *prefix, const char *filename,
-                        int snapshots)
+static int make_snapshot(const struct cgit_snapshot_format *format,
+                        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;
-               if(!(snapshots&sat->bit)) continue;
-               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];
-
-               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(!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;
-
-               cgit_print_snapshot_start(sat->mimetype, filename, item);
-               (*sat->write_func)(&args);
-               return;
+       if(get_sha1(hex, sha1)) {
+               cgit_print_error(fmt("Bad object id: %s", hex));
+               return 1;
        }
-       cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
-}
-
-void cgit_print_snapshot_links(const char *repo,const char *hex,int snapshots)
-{
-       char *filename;
-       int f;
-       for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
-               const struct snapshot_archive_t* sat = &snapshot_archives[f];
-               if(!(snapshots&sat->bit)) continue;
-               filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix);
-               htmlf("<a href='%s'>%s</a><br/>",
-                       cgit_fileurl(repo,"snapshot",filename,
-                           fmt("id=%s&amp;name=%s",hex,filename)), filename);
+       commit = lookup_commit_reference(sha1);
+       if(!commit) {
+               cgit_print_error(fmt("Not a commit reference: %s", hex));
+               return 1;
        }
+       memset(&args, 0, sizeof(args));
+       args.base = fmt("%s/", prefix);
+       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;
 }
 
-int cgit_parse_snapshots_mask(const char *str)
+void cgit_print_snapshot(const char *head, const char *hex, const char *prefix,
+                        const char *filename, int snapshots)
 {
-       static const char *delim = " \t,:/|;";
-       int f, tl, rv = 0;
-       /* favor legacy setting */
-       if(atoi(str)) return 1;
-       for(;;) {
-               str += strspn(str,delim);
-               tl = strcspn(str,delim);
-               if(!tl)
-                       break;
-               for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
-                       const struct snapshot_archive_t* sat = &snapshot_archives[f];
-                       if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) {
-                               rv |= sat->bit;
-                               break;
-                       }
-               }
-               str += tl;
+       const struct cgit_snapshot_format* f;
+       int sl, fnl;
+
+       fnl = strlen(filename);
+       if (!hex)
+               hex = head;
+       for (f = cgit_snapshot_formats; f->suffix; f++) {
+               if (!(snapshots & f->bit))
+                       continue;
+               sl = strlen(f->suffix);
+               if(fnl < sl || strcmp(&filename[fnl-sl], f->suffix))
+                       continue;
+               make_snapshot(f, hex, prefix, filename);
+               return;
        }
-       return rv;
+       cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 }
-
-/* vim:set sw=8: */