Set prefix in snapshots when using dwimmery

This patch sets the directory prefix in archives to be the filename,
excluding the suffix (.tar.gz, .tar.bz2 etc).

The patch also removes the prefix parameter in cgit_print_snapshot()
as the prefix might differ.

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

1 files changed, 12 insertions, 2 deletions

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 9c4d086..76457d6 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -149,40 +149,50 @@ static int ref_cb(const char *refname, const unsigned char *sha1, int flags,
 static const char *get_ref_from_filename(const char *url, const char *filename,
                                          const struct cgit_snapshot_format *fmt)
 {
         const char *reponame = cgit_repobasename(url);
         fprintf(stderr, "reponame=%s, filename=%s\n", reponame, filename);
         if (prefixcmp(filename, reponame))
                 return NULL;
         filename += strlen(reponame);
         while (filename && (*filename == '-' || *filename == '_'))
                 filename++;
         dwim_filename = xstrdup(filename);
         dwim_filename[strlen(filename) - strlen(fmt->suffix)] = '\0';
         for_each_tag_ref(ref_cb, NULL);
         return dwim_refname;
 }
 
-void cgit_print_snapshot(const char *head, const char *hex, const char *prefix,
+void cgit_print_snapshot(const char *head, const char *hex,
                          const char *filename, int snapshots, int dwim)
 {
         const struct cgit_snapshot_format* f;
+        char *prefix = NULL;
 
         f = get_format(filename);
         if (!f) {
                 ctx.page.mimetype = "text/html";
                 cgit_print_http_headers(&ctx);
                 cgit_print_docstart(&ctx);
                 cgit_print_pageheader(&ctx);
                 cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
                 cgit_print_docend();
                 return;
         }
 
-        if (!hex && dwim)
+        if (!hex && dwim) {
                 hex = get_ref_from_filename(ctx.repo->url, filename, f);
+                if (hex != NULL) {
+                        prefix = xstrdup(filename);
+                        prefix[strlen(filename) - strlen(f->suffix)] = '\0';
+                }
+        }
 
         if (!hex)
                 hex = head;
 
+        if (!prefix)
+                prefix = xstrdup(cgit_repobasename(ctx.repo->url));
+
         make_snapshot(f, hex, prefix, filename);
+        free(prefix);
 }