added snapshot filename to the link

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 2257d6b9e574171c185e76a5fc21b7aeb7826882..7076b500fdc52581e573cd70b665e9cafa879a66 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,40 +8,109 @@
 
 #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)

 {
 {

-       struct archiver_args args;
-       struct commit *commit;
-       unsigned char sha1[20];
+       int rw[2];
+       pid_t gzpid;
+       int stdout2;
+       int status;
+       int rv;

 
 

-       if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
-               return;
+       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);

        }
        }

-       commit = lookup_commit_reference(sha1);
+       /* 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);

 
 

-       if (!commit) {
-               cgit_print_error(fmt("Not a commit reference: %s", hex));
-               return;
-       }
+       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");

 
 

-       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);
+       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;
+}      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 }
+};

 
 void cgit_print_snapshot(struct cacheitem *item, const char *hex, 
 
 void cgit_print_snapshot(struct cacheitem *item, const char *hex, 

-                        const char *format, const char *prefix,
-                        const char *filename)
+                        const char *prefix, const char *filename)

 {
 {

-       if (!strcmp(format, "zip"))
-               cgit_print_zip(item, hex, prefix, filename);
-       else
-               cgit_print_error(fmt("Unsupported snapshot format: %s", 
-                                    format));
+       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;
+
+               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;;
+               }
+
+               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;
+       }
+       cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
+}
+
+void cgit_print_snapshot_links(const char *repo,const char *hex)
+{
+       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_fileurl(repo,"snapshot",filename,
+                           fmt("id=%s&amp;name=%s",hex,filename)), filename);
+       }

 }
 }

+/* vim:set sw=8: */