author | Lars Hjemli <hjemli@gmail.com> | 2007-05-11 21:44:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-11 21:44:42 (UTC) |
commit | 9f48df63f6d8d9a8abcc02cd2f08293da7081520 (patch) (side-by-side diff) | |
tree | d171ce9834577d3133e584c821f78806fbe0daef | |
parent | f596d10d7391ed72b73019e037a7f7eec7a50d02 (diff) | |
download | cgit-9f48df63f6d8d9a8abcc02cd2f08293da7081520.zip cgit-9f48df63f6d8d9a8abcc02cd2f08293da7081520.tar.gz cgit-9f48df63f6d8d9a8abcc02cd2f08293da7081520.tar.bz2 |
Add links to enable downloading of tagged blobs
All tags below refs/archives are shown on the repo summary page as
download links. The links referes to the tagged objects, using the
tag name as filename for download.
This can be used to add shortcuts for release tarballs, documentation
and other blobs stored in the object database, especially blobs that
are not reachable during cloning.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.css | 20 | ||||
-rw-r--r-- | ui-summary.c | 74 |
2 files changed, 85 insertions, 9 deletions
@@ -1,271 +1,291 @@ body { font-family: arial; font-size: 11pt; background: white; padding: 0em; margin: 0em; } h2 { font-size: 120%; font-weight: bold; + margin-top: 0em; margin-bottom: 0.25em; } h3 { margin-top: 0em; font-size: 100%; font-weight: normal; } a { color: blue; text-decoration: none; } a:hover { text-decoration: underline; } table.list { border: none; border-collapse: collapse; } table.list tr { background: white; } table.list tr:hover { background: #eee; } table.list tr.nohover:hover { background: white; } table.list th { font-weight: normal; border-bottom: solid 1px #777; padding: 0.1em 0.5em 0.1em 0.5em; vertical-align: baseline; } table.list td { border: none; padding: 0.1em 0.5em 0.1em 0.5em; } img { border: none; } table#layout { width: 100%; border-collapse: separate; border-spacing: 0px; margin: 0px; } td#header, td#logo { color: #666; background-color: #ddd; border-bottom: solid 1px #000; } td#header { font-size: 150%; font-weight: bold; padding: 0.2em 0.5em; vertical-align: text-bottom; } td#logo { text-align: right; vertical-align: middle; padding-right: 0.5em; } td#crumb, td#search { color: #ccc; border-top: solid 3px #555; background-color: #666; border-bottom: solid 1px #333; padding: 2px 1em; } td#crumb { font-weight: bold; } td#crumb a { color: #ccc; } td#crumb a:hover { color: #eee; } td#search { text-align: right; vertical-align: center; padding-right: 0.5em; } td#search form { margin: 0px; padding: 0px; } td#search input { font-size: 9pt; padding: 0px; width: 10em; border: solid 1px #333; color: #333; background-color: #fff; } +td#summary { + vertical-align: top; + padding-bottom: 1em; +} + +td#archivelist { + padding-bottom: 1em; +} + +td#archivelist table { + float: right; + border-collapse: collapse; + border: solid 1px #777; +} + +td#archivelist table th { + background-color: #ccc; +} + td#content { padding: 1em 0.5em; } div#blob { border: solid 1px black; } div.error { color: red; font-weight: bold; margin: 1em 2em; } td.ls-blob, td.ls-dir, td.ls-mod { font-family: monospace; } div.ls-dir a { font-weight: bold; } th.filesize, td.filesize { text-align: right; } td.filesize { font-family: monospace; } td.filemode { font-family: monospace; } td.blob { white-space: pre; font-family: monospace; background-color: white; } table.nowrap td { white-space: nowrap; } table.commit-info { border-collapse: collapse; margin-top: 1.5em; } table.commit-info th { text-align: left; font-weight: normal; padding: 0.1em 1em 0.1em 0.1em; } table.commit-info td { font-weight: normal; padding: 0.1em 1em 0.1em 0.1em; } div.commit-subject { font-weight: bold; font-size: 125%; margin: 1.5em 0em 0.5em 0em; padding: 0em; } div.commit-msg { white-space: pre; font-family: monospace; } table.diffstat { border-collapse: collapse; margin-top: 1.5em; } table.diffstat th { font-weight: normal; text-align: left; text-decoration: underline; padding: 0.1em 1em 0.1em 0.1em; font-size: 100%; } table.diffstat td { padding: 0.1em 1em 0.1em 0.1em; font-size: 100%; } table.diffstat td span.modechange { padding-left: 1em; color: red; } table.diffstat td.add a { color: green; } table.diffstat td.del a { color: red; } table.diffstat td.upd a { color: blue; } table.diffstat td.summary { color: #888; padding-top: 0.5em; } table.diff td { border: solid 1px black; font-family: monospace; white-space: pre; } table.diff td div.hunk { background: #ccc; } table.diff td div.add { color: green; } table.diff td div.del { color: red; } .sha1 { font-family: courier; font-size: 90%; } .left { text-align: left; } .right { text-align: right; } diff --git a/ui-summary.c b/ui-summary.c index 0a7869b..9388f5f 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -1,141 +1,197 @@ /* ui-summary.c: functions for generating repo summary page * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" +int items = 0; + static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct commit *commit; struct commitinfo *info; char buf[256], *url; strncpy(buf, refname, sizeof(buf)); commit = lookup_commit(sha1); if (commit && !parse_commit(commit)){ info = cgit_parse_commit(commit); html("<tr><td>"); url = cgit_pageurl(cgit_query_repo, "log", fmt("h=%s", refname)); html_link_open(url, NULL, NULL); html_txt(buf); html_link_close(); html("</td><td>"); cgit_print_date(commit->date); html("</td><td>"); html_txt(info->author); html("</td><td>"); url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1))); html_link_open(url, NULL, NULL); html_ntxt(cgit_max_msg_len, info->subject); html_link_close(); html("</td></tr>\n"); cgit_free_commitinfo(info); } else { html("<tr><td>"); html_txt(buf); html("</td><td colspan='3'>"); htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); html("</td></tr>\n"); } return 0; } static void cgit_print_object_ref(struct object *obj) { char *page, *url; if (obj->type == OBJ_COMMIT) page = "commit"; else if (obj->type == OBJ_TREE) page = "tree"; else page = "view"; url = cgit_pageurl(cgit_query_repo, page, fmt("id=%s", sha1_to_hex(obj->sha1))); html_link_open(url, NULL, NULL); htmlf("%s %s", typename(obj->type), sha1_to_hex(obj->sha1)); html_link_close(); } static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct tag *tag; struct taginfo *info; struct object *obj; char buf[256], *url; strncpy(buf, refname, sizeof(buf)); obj = parse_object(sha1); if (!obj) return 1; if (obj->type == OBJ_TAG) { tag = lookup_tag(sha1); if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 2; + if (!items) { + html("<tr class='nohover'><th class='left'>Tag</th>" + "<th class='left'>Created</th>" + "<th class='left'>Author</th>" + "<th class='left'>Reference</th></tr>\n"); + } + items++; html("<tr><td>"); url = cgit_pageurl(cgit_query_repo, "view", fmt("id=%s", sha1_to_hex(sha1))); html_link_open(url, NULL, NULL); html_txt(buf); html_link_close(); html("</td><td>"); if (info->tagger_date > 0) cgit_print_date(info->tagger_date); html("</td><td>"); if (info->tagger) html(info->tagger); html("</td><td>"); cgit_print_object_ref(tag->tagged); html("</td></tr>\n"); } else { html("<tr><td>"); html_txt(buf); html("</td><td colspan='2'/><td>"); cgit_print_object_ref(obj); html("</td></tr>\n"); } return 0; } +static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, + int flags, void *cb_data) +{ + struct tag *tag; + struct taginfo *info; + struct object *obj; + char buf[256], *url; + + if (prefixcmp(refname, "refs/archives")) + return 0; + strncpy(buf, refname+14, sizeof(buf)); + obj = parse_object(sha1); + if (!obj) + return 1; + if (obj->type == OBJ_TAG) { + tag = lookup_tag(sha1); + if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) + return 0; + hashcpy(sha1, tag->tagged->sha1); + } else if (obj->type != OBJ_BLOB) { + return 0; + } + if (!items) { + html("<table>"); + html("<tr><th>Downloads</th></tr>"); + } + items++; + html("<tr><td>"); + url = cgit_pageurl(cgit_query_repo, "blob", + fmt("id=%s&path=%s", sha1_to_hex(sha1), + buf)); + html_link_open(url, NULL, NULL); + html_txt(buf); + html_link_close(); + html("</td><tr>"); + return 0; +} + static void cgit_print_branches() { html("<tr class='nohover'><th class='left'>Branch</th>" "<th class='left'>Updated</th>" "<th class='left'>Author</th>" "<th class='left'>Head commit</th></tr>\n"); for_each_branch_ref(cgit_print_branch_cb, NULL); } static void cgit_print_tags() { - html("<tr class='nohover'><th class='left'>Tag</th>" - "<th class='left'>Created</th>" - "<th class='left'>Author</th>" - "<th class='left'>Reference</th></tr>\n"); + items = 0; for_each_tag_ref(cgit_print_tag_cb, NULL); } +static void cgit_print_archives() +{ + items = 0; + for_each_ref(cgit_print_archive_cb, NULL); + if (items) + html("</table>"); +} + void cgit_print_summary() { - html("<h2>"); - html(cgit_repo->name); - html("</h2><h3>"); - html(cgit_repo->desc); - html("</h3>"); html("<table class='list nowrap'>"); + html("<tr class='nohover'><td id='summary' colspan='3'>"); + html("<h2>"); + html_txt(cgit_repo->name); + html(" - "); + html_txt(cgit_repo->desc); + html("</h2>"); + html("</td><td id='archivelist'>"); + cgit_print_archives(); + html("</td></tr>"); cgit_print_branches(); html("<tr class='nohover'><td colspan='4'> </td></tr>"); cgit_print_tags(); html("</table>"); } |