ui-shared.c: prettify download links when generated from tag page

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index cf065116cfdd19da8c63f0ae2324c55f9f546cac..6cb7edb27ccb3d40b5c1e309940b7ed198a8d5c9 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -630,14 +630,17 @@ static void print_header(struct cgit_context *ctx)
 {
        html("<table id='header'>\n");
        html("<tr>\n");
-       html("<td class='logo' rowspan='2'><a href='");
-       if (ctx->cfg.logo_link)
-               html_attr(ctx->cfg.logo_link);
-       else
-               html_attr(cgit_rooturl());
-       html("'><img src='");
-       html_attr(ctx->cfg.logo);
-       html("' alt='cgit logo'/></a></td>\n");
+
+       if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+               html("<td class='logo' rowspan='2'><a href='");
+               if (ctx->cfg.logo_link)
+                       html_attr(ctx->cfg.logo_link);
+               else
+                       html_attr(cgit_rooturl());
+               html("'><img src='");
+               html_attr(ctx->cfg.logo);
+               html("' alt='cgit logo'/></a></td>\n");
+       }
 
        html("<td class='main'>");
        if (ctx->repo) {
@@ -757,13 +760,18 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
+       char *prefix;
        char *filename;
+       unsigned char sha1[20];
 
+       if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
+           (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
+               hex++;
+       prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;
-               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
-                              f->suffix);
+               filename = fmt("%s%s", prefix, f->suffix);
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("<br/>");
        }