snapshot: support tar signature for compressed tar

[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c

index d8578739576f090256f4b1bbe8232f1ff77f0b36..066a470e5dd419b503bd4ff80646028079f844ad 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -775,6 +775,8 @@ void cgit_print_docstart(void)
                 cgit_add_clone_urls(print_rel_vcs_link);
         if (ctx.cfg.head_include)
                 html_include(ctx.cfg.head_include);
+       if (ctx.repo && ctx.repo->extra_head_content)
+               html(ctx.repo->extra_head_content);
         html("</head>\n");
         html("<body>\n");
         if (ctx.cfg.header)
@@ -977,8 +979,6 @@ static void print_header(void)
         } else {
                 if (ctx.cfg.root_desc)
                         html_txt(ctx.cfg.root_desc);
-               else if (ctx.cfg.index_info)
-                       html_include(ctx.cfg.index_info);
         }
         html("</td></tr></table>\n");
  }
@@ -1111,23 +1111,43 @@ void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base,
         strbuf_addf(filename, "%s-%s", base, ref);
  }
  
-void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *head,
-                              const char *hex)
+void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
+                              const char *separator)
  {
-       const struct cgit_snapshot_format* f;
+       const struct cgit_snapshot_format *f;
         struct strbuf filename = STRBUF_INIT;
+       const char *basename;
         size_t prefixlen;
  
-       cgit_compose_snapshot_prefix(&filename, cgit_snapshot_prefix(repo), hex);
+       basename = cgit_snapshot_prefix(repo);
+       if (starts_with(ref, basename))
+               strbuf_addstr(&filename, ref);
+       else
+               cgit_compose_snapshot_prefix(&filename, basename, ref);
+
         prefixlen = filename.len;
         for (f = cgit_snapshot_formats; f->suffix; f++) {
-               if (!(repo->snapshots & f->bit))
+               if (!(repo->snapshots & cgit_snapshot_format_bit(f)))
                         continue;
                 strbuf_setlen(&filename, prefixlen);
                 strbuf_addstr(&filename, f->suffix);
                 cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL,
                                    filename.buf);
-               html("<br/>");
+               if (cgit_snapshot_get_sig(ref, f)) {
+                       strbuf_addstr(&filename, ".asc");
+                       html(" (");
+                       cgit_snapshot_link("sig", NULL, NULL, NULL, NULL,
+                                          filename.buf);
+                       html(")");
+               } else if (starts_with(f->suffix, ".tar") && cgit_snapshot_get_sig(ref, &cgit_snapshot_formats[0])) {
+                       strbuf_setlen(&filename, strlen(filename.buf) - strlen(f->suffix));
+                       strbuf_addstr(&filename, ".tar.asc");
+                       html(" (");
+                       cgit_snapshot_link("sig", NULL, NULL, NULL, NULL,
+                                          filename.buf);
+                       html(")");
+               }
+               html(separator);
         }
         strbuf_release(&filename);
  }