Make print_branch() handle refs not pointing at commits

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 2257d6b9e574171c185e76a5fc21b7aeb7826882..bd34a28a41713cccffff7a52742e4a61038e0544 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,40 +8,148 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

-static void cgit_print_zip(struct cacheitem *item, const char *hex, 
-                          const char *prefix, const char *filename)
+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, 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 }
+};
+
+#define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives))
+
+void cgit_print_snapshot(struct cacheitem *item, const char *head,
+                        const char *hex, const char *prefix,
+                        const char *filename, int snapshots)
+{
+       const struct snapshot_archive_t* sat;

        struct archiver_args args;
        struct commit *commit;
        unsigned char sha1[20];
        struct archiver_args args;
        struct commit *commit;
        unsigned char sha1[20];

+       int f, sl, fnl = strlen(filename);

 
 

-       if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
+       for(f=0; f<snapshot_archives_len; f++) {
+               sat = &snapshot_archives[f];
+               if(!(snapshots & sat->bit))
+                       continue;
+               sl = strlen(sat->suffix);
+               if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
+                       continue;
+               if (!hex)
+                       hex = head;
+               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;
+               cgit_print_snapshot_start(sat->mimetype, filename, item);
+               (*sat->write_func)(&args);

                return;
        }
                return;
        }

-       commit = lookup_commit_reference(sha1);
+       cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
+}

 
 

-       if (!commit) {
-               cgit_print_error(fmt("Not a commit reference: %s", hex));
-               return;
-       }
+void cgit_print_snapshot_links(const char *repo, const char *head,
+                              const char *hex, int snapshots)
+{
+       const struct snapshot_archive_t* sat;
+       char *filename;
+       int f;

 
 

-       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);
+       for(f=0; f<snapshot_archives_len; f++) {
+               sat = &snapshot_archives[f];
+               if(!(snapshots & sat->bit))
+                       continue;
+               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+                              sat->suffix);
+               cgit_snapshot_link(filename, NULL, NULL, (char *)head,
+                                  (char *)hex, filename);
+               html("<br/>");
+       }

 }
 
 }
 

-
-void cgit_print_snapshot(struct cacheitem *item, const char *hex, 
-                        const char *format, const char *prefix,
-                        const char *filename)
+int cgit_parse_snapshots_mask(const char *str)

 {
 {

-       if (!strcmp(format, "zip"))
-               cgit_print_zip(item, hex, prefix, filename);
-       else
-               cgit_print_error(fmt("Unsupported snapshot format: %s", 
-                                    format));
+       const struct snapshot_archive_t* sat;
+       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<snapshot_archives_len; f++) {
+                       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: */