X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/18a99bdf879953307d6ae6eb56c2117a4c074b0d..98fcf7227c8dda520c864ea8a51012934115258f:/ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index f623f35..bd34a28 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -30,7 +30,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,6 +48,7 @@ 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");
@@ -57,42 +58,47 @@ 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-tar", write_tar_gzip_archive },
-	{ ".tar.bz2", "application/x-tar", write_tar_bzip2_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)
+#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)
 {
-	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);
+	const struct snapshot_archive_t* sat;
+	struct archiver_args args;
+	struct commit *commit;
+	unsigned char sha1[20];
+	int f, sl, fnl = strlen(filename);
+
+	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;
-
-		struct archiver_args args;
-		struct commit *commit;
-		unsigned char sha1[20];
-
+		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;
@@ -100,16 +106,50 @@ 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 *head,
+			       const char *hex, int snapshots)
 {
+	const struct snapshot_archive_t* sat;
     	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_pageurl(repo,"snapshot",
-			    fmt("id=%s&amp;name=%s",hex,filename)), filename);
+
+	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/>");
+	}
+}
+
+int cgit_parse_snapshots_mask(const char *str)
+{
+	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: */