allow selective enabling of snapshots

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index eb5f1cdf0affdbb89781494786a8a4f654661d71..d6be55b01e5e75ee63d760c53adb12bf6fa91be6 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,23 +8,74 @@
 
 #include "cgit.h"
 
+static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
+{
+       int rw[2];
+       pid_t gzpid;
+       int stdout2;
+       int status;
+       int rv;
+
+       stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
+       chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
+       gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
+       if(gzpid==0) {
+               /* child */
+               chk_zero(close(rw[1]), "Closing write end of pipe in child");
+               chk_zero(close(STDIN_FILENO), "Closing STDIN");
+               chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
+               execlp(filter,filter,NULL);
+               _exit(-1);
+       }
+       /* 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");
+       chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
+       chk_zero(close(stdout2), "Closing uncompressed STDOUT");
+       chk_zero(close(rw[1]), "Closing write end of pipe in parent");
+       chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
+       if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
+               cgit_print_error("Failed to compress archive");
+
+       return rv;
+}
+
+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[] = {
-       { ".zip", "application/x-zip", write_zip_archive },
-       { ".tar.gz", "application/x-gzip", write_tar_archive }
+       { ".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)
+                        const char *prefix, const char *filename,
+                        int snapshots)
 {
        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);
+               int sl;
+               if(!(snapshots&sat->bit)) continue;
+               sl = strlen(sat->suffix);
                if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
                        continue;
 
@@ -54,15 +105,41 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex,
        cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 }
 
-void cgit_print_snapshot_links(const char *repo,const char *hex)
+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];
-               filename = fmt("%s-%s%s",repo,hex,sat->suffix);
+               if(!(snapshots&sat->bit)) continue;
+               filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix);
                htmlf("<a href='%s'>%s</a><br/>",
-                       cgit_pageurl(repo,"snapshot",
+                       cgit_fileurl(repo,"snapshot",filename,
                            fmt("id=%s&amp;name=%s",hex,filename)), filename);
        }
 }
+
+int cgit_parse_snapshots_mask(const char *str)
+{
+       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;
+       }
+       return rv;
+}
+
+/* vim:set sw=8: */