cgit_print_snapshot_links: use url to specify snapshot name

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

5 files changed, 41 insertions, 21 deletions

diff --git a/cgit.c b/cgit.c
index 6597529..c86d290 100644
--- a/cgit.c
+++ b/cgit.c
@@ -63,19 +63,19 @@ static void cgit_print_repo_page(struct cacheitem *item)
 		return;
 	}
 
 	title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
 	show_search = 0;
 	setenv("GIT_DIR", cgit_repo->path, 1);
 
 	if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
-		cgit_print_snapshot(item, cgit_query_sha1,
+		cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
 				    cgit_repobasename(cgit_repo->url),
-				    cgit_query_name,
+				    cgit_query_path,
 				    cgit_repo->snapshots );
 		return;
 	}
 
 	if (cgit_cmd == CMD_BLOB) {
 		cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
 		return;
 	}
diff --git a/cgit.h b/cgit.h
index eddcaa3..e3d9cb8 100644
--- a/cgit.h
+++ b/cgit.h
@@ -209,16 +209,18 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename,
 extern const char *cgit_repobasename(const char *reponame);
 
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
 			   char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
 			  char *rev, char *path, int ofs);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
 			     char *rev);
+extern void cgit_snapshot_link(char *name, char *title, char *class,
+			       char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
 			   char *new_rev, char *old_rev, char *path);
 
 extern void cgit_object_link(struct object *obj);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
@@ -232,15 +234,16 @@ extern void cgit_print_snapshot_start(const char *mimetype,
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);
 extern void cgit_print_tag(char *revname);
 extern void cgit_print_diff(const char *new_hex, const char *old_hex);
-extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
-				const char *prefix, const char *filename,
-				int snapshot);
-extern void cgit_print_snapshot_links(const char *repo, const char *hex,int snapshots);
+extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
+				const char *hex, const char *prefix,
+				const char *filename, int snapshot);
+extern void cgit_print_snapshot_links(const char *repo, const char *head,
+				      const char *hex, int snapshots);
 extern int cgit_parse_snapshots_mask(const char *str);
 
 #endif /* CGIT_H */
diff --git a/ui-commit.c b/ui-commit.c
index 50e9e11..90e09ed 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -191,17 +191,18 @@ void cgit_print_commit(char *hex)
 				 cgit_query_head, sha1_to_hex(p->item->object.sha1));
 		html(" (");
 		cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
 			       sha1_to_hex(p->item->object.sha1), NULL);
 		html(")</td></tr>");
 	}
 	if (cgit_repo->snapshots) {
 		html("<tr><th>download</th><td colspan='2' class='sha1'>");
-		cgit_print_snapshot_links(cgit_query_repo,hex,cgit_repo->snapshots);
+		cgit_print_snapshot_links(cgit_query_repo, cgit_query_head,
+					  hex, cgit_repo->snapshots);
 		html("</td></tr>");
 	}
 	html("</table>\n");
 	html("<div class='commit-subject'>");
 	html_txt(info->subject);
 	html("</div>");
 	html("<div class='commit-msg'>");
 	html_txt(info->msg);
diff --git a/ui-shared.c b/ui-shared.c
index ca2ee82..5c5bcf3 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -222,16 +222,22 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
 		name[cgit_max_msg_len] = '\0';
 		name[cgit_max_msg_len - 1] = '.';
 		name[cgit_max_msg_len - 2] = '.';
 		name[cgit_max_msg_len - 3] = '.';
 	}
 	reporevlink("commit", name, title, class, head, rev, NULL);
 }
 
+void cgit_snapshot_link(char *name, char *title, char *class, char *head,
+			char *rev, char *archivename)
+{
+	reporevlink("snapshot", name, title, class, head, rev, archivename);
+}
+
 void cgit_diff_link(char *name, char *title, char *class, char *head,
 		    char *new_rev, char *old_rev, char *path)
 {
 	char *delim;
 
 	delim = repolink(title, class, "diff", head, path);
 	if (new_rev && strcmp(new_rev, cgit_query_head)) {
 		html(delim);
diff --git a/ui-snapshot.c b/ui-snapshot.c
index d6be55b..f9879ed 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -60,34 +60,39 @@ static const struct snapshot_archive_t {
 	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 *prefix, const char *filename,
-			 int snapshots)
+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) {
+	int f, n;
+
+	n = sizeof(snapshot_archives) / sizeof(*snapshot_archives);
+    	for(f=0; f<n; f++) {
 		const struct snapshot_archive_t* sat = &snapshot_archives[f];
 		int sl;
-		if(!(snapshots&sat->bit)) continue;
+		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));
@@ -100,27 +105,32 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex,
 
 		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)
+void cgit_print_snapshot_links(const char *repo, const char *head,
+			       const char *hex, int snapshots)
 {
     	char *filename;
-	int f;
-    	for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+	int f, n;
+
+	n = sizeof(snapshot_archives) / sizeof(*snapshot_archives);
+    	for(f=0; f<n ;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);
+		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)
 {
 	static const char *delim = " \t,:/|;";
 	int f, tl, rv = 0;
 	/* favor legacy setting */