Add "snapshot-prefix" repo configuration

[cgit.git] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 08c6e80550e1147d920611f1c29c9ad1c882ce7d..b9e2a36f9dd57a475c364437c7de82d487986565 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
        /* argv_array guarantees a trailing NULL entry. */
        memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
-       result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
+       result = write_archive(argv.argc, nargv, NULL, NULL, 0);
        argv_array_clear(&argv);
        free(nargv);
        return result;
@@ -116,7 +116,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
                                "Bad object id: %s", hex);
                return 1;
        }
-       if (!lookup_commit_reference(oid.hash)) {
+       if (!lookup_commit_reference(&oid)) {
                cgit_print_error_page(400, "Bad request",
                                "Not a commit reference: %s", hex);
                return 1;
@@ -139,7 +139,8 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
  * pending a 'v' or a 'V' to the remaining snapshot name ("0.7.2" ->
  * "v0.7.2") gives us something valid.
  */
-static const char *get_ref_from_filename(const char *url, const char *filename,
+static const char *get_ref_from_filename(const struct cgit_repo *repo,
+                                        const char *filename,
                                         const struct cgit_snapshot_format *format)
 {
        const char *reponame;
@@ -153,7 +154,7 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
        if (get_oid(snapshot.buf, &oid) == 0)
                goto out;
 
-       reponame = cgit_repobasename(url);
+       reponame = cgit_snapshot_prefix(repo);
        if (starts_with(snapshot.buf, reponame)) {
                const char *new_start = snapshot.buf;
                new_start += strlen(reponame);
@@ -200,7 +201,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
        }
 
        if (!hex && dwim) {
-               hex = get_ref_from_filename(ctx.repo->url, filename, f);
+               hex = get_ref_from_filename(ctx.repo, filename, f);
                if (hex == NULL) {
                        cgit_print_error_page(404, "Not found", "Not found");
                        return;
@@ -213,7 +214,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
                hex = head;
 
        if (!prefix)
-               prefix = xstrdup(cgit_repobasename(ctx.repo->url));
+               prefix = xstrdup(cgit_snapshot_prefix(ctx.repo));
 
        make_snapshot(f, hex, prefix, filename);
        free(prefix);