summaryrefslogtreecommitdiff
path: root/ui-snapshot.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-07-22 23:57:48 +0200
committerLars Hjemli <hjemli@gmail.com>2007-07-22 23:57:56 +0200
commit1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0 (patch)
tree6674c5168d967c3efdbf8f445e7e975d54e43629 /ui-snapshot.c
parent4e9107abfe8d3edff17826875b417bcf40dc7390 (diff)
parentd6b01dac856efda565d4085e77826fd9ac83348a (diff)
Merge branch 'master' of git://git.klever.net/patchwork/cgit
* 'master' of git://git.klever.net/patchwork/cgit: link raw blob from tree file view fix: changed view link to blob in summary. allow selective enabling of snapshots shorten snapshot names to repo basename introduce cgit_repobasename added snapshot filename to the link add plain uncompressed tar snapshort format introduced .tar.bz2 snapshots compress .tar.gz using gzip as a filter added a chk_non_negative check css: adjust vertical-align of commit info th cells add support for snapshot tarballs Conflicts: ui-summary.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-snapshot.c')
-rw-r--r--ui-snapshot.c150
1 files changed, 124 insertions, 26 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 2257d6b..d6be55b 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,40 +8,138 @@
#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;
+ 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 }
+};
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,
+ 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;
+ 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);
+
+ 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,int snapshots)
{
- if (!strcmp(format, "zip"))
- cgit_print_zip(item, hex, prefix, filename);
- else
- cgit_print_error(fmt("Unsupported snapshot format: %s",
- format));
+ 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);
+ }
+}
+
+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: */