summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-12-01 20:56:07 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-01 21:01:10 (UTC)
commit6596268576a4f5fe2f5c8a3238856b0fb205ff76 (patch) (unidiff)
tree9cd8a7b68a6aeea9aa44e7b25dacc8f9cdc918f1
parentb9053a4ff04fef90d1b9ab3f813ae3fcee63a8c3 (diff)
downloadcgit-6596268576a4f5fe2f5c8a3238856b0fb205ff76.zip
cgit-6596268576a4f5fe2f5c8a3238856b0fb205ff76.tar.gz
cgit-6596268576a4f5fe2f5c8a3238856b0fb205ff76.tar.bz2
ui-refs.c: show download links for all tags referring to commit objects
The snapshot function has only been linked to from the commit page while users often would want to download a certain release. With this patch, direct download links will now be printed for each tagged release on the repo summary page. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-refs.c33
1 files changed, 32 insertions, 1 deletions
diff --git a/ui-refs.c b/ui-refs.c
index 32e0429..0805fc8 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -57,82 +57,113 @@ static int print_branch(struct refinfo *ref)
57 57
58 if (!info) 58 if (!info)
59 return 1; 59 return 1;
60 html("<tr><td>"); 60 html("<tr><td>");
61 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL); 61 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
62 html("</td><td>"); 62 html("</td><td>");
63 63
64 if (ref->object->type == OBJ_COMMIT) { 64 if (ref->object->type == OBJ_COMMIT) {
65 cgit_commit_link(info->subject, NULL, NULL, name, NULL); 65 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
66 html("</td><td>"); 66 html("</td><td>");
67 html_txt(info->author); 67 html_txt(info->author);
68 html("</td><td colspan='2'>"); 68 html("</td><td colspan='2'>");
69 cgit_print_age(info->commit->date, -1, NULL); 69 cgit_print_age(info->commit->date, -1, NULL);
70 } else { 70 } else {
71 html("</td><td></td><td>"); 71 html("</td><td></td><td>");
72 cgit_object_link(ref->object); 72 cgit_object_link(ref->object);
73 } 73 }
74 html("</td></tr>\n"); 74 html("</td></tr>\n");
75 return 0; 75 return 0;
76} 76}
77 77
78static void print_tag_header() 78static void print_tag_header()
79{ 79{
80 html("<tr class='nohover'><th class='left'>Tag</th>" 80 html("<tr class='nohover'><th class='left'>Tag</th>"
81 "<th class='left'>Reference</th>" 81 "<th class='left'>Download</th>"
82 "<th class='left'>Author</th>" 82 "<th class='left'>Author</th>"
83 "<th class='left' colspan='2'>Age</th></tr>\n"); 83 "<th class='left' colspan='2'>Age</th></tr>\n");
84 header = 1; 84 header = 1;
85} 85}
86 86
87static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
88{
89 const struct cgit_snapshot_format* f;
90 char *filename;
91 const char *basename;
92
93 if (!ref || strlen(ref) < 2)
94 return;
95
96 basename = cgit_repobasename(repo->url);
97 if (prefixcmp(ref, basename) != 0) {
98 if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
99 ref++;
100 if (isdigit(ref[0]))
101 ref = xstrdup(fmt("%s-%s", basename, ref));
102 }
103
104 for (f = cgit_snapshot_formats; f->suffix; f++) {
105 if (!(repo->snapshots & f->bit))
106 continue;
107 filename = fmt("%s%s", ref, f->suffix);
108 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
109 html("&nbsp;&nbsp;");
110 }
111}
87static int print_tag(struct refinfo *ref) 112static int print_tag(struct refinfo *ref)
88{ 113{
89 struct tag *tag; 114 struct tag *tag;
90 struct taginfo *info; 115 struct taginfo *info;
91 char *name = (char *)ref->refname; 116 char *name = (char *)ref->refname;
92 117
93 if (ref->object->type == OBJ_TAG) { 118 if (ref->object->type == OBJ_TAG) {
94 tag = (struct tag *)ref->object; 119 tag = (struct tag *)ref->object;
95 info = ref->tag; 120 info = ref->tag;
96 if (!tag || !info) 121 if (!tag || !info)
97 return 1; 122 return 1;
98 html("<tr><td>"); 123 html("<tr><td>");
99 cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); 124 cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
100 html("</td><td>"); 125 html("</td><td>");
126 if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
127 print_tag_downloads(ctx.repo, name);
128 else
101 cgit_object_link(tag->tagged); 129 cgit_object_link(tag->tagged);
102 html("</td><td>"); 130 html("</td><td>");
103 if (info->tagger) 131 if (info->tagger)
104 html(info->tagger); 132 html(info->tagger);
105 html("</td><td colspan='2'>"); 133 html("</td><td colspan='2'>");
106 if (info->tagger_date > 0) 134 if (info->tagger_date > 0)
107 cgit_print_age(info->tagger_date, -1, NULL); 135 cgit_print_age(info->tagger_date, -1, NULL);
108 html("</td></tr>\n"); 136 html("</td></tr>\n");
109 } else { 137 } else {
110 if (!header) 138 if (!header)
111 print_tag_header(); 139 print_tag_header();
112 html("<tr><td>"); 140 html("<tr><td>");
113 html_txt(name); 141 html_txt(name);
114 html("</td><td>"); 142 html("</td><td>");
143 if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
144 print_tag_downloads(ctx.repo, name);
145 else
115 cgit_object_link(ref->object); 146 cgit_object_link(ref->object);
116 html("</td></tr>\n"); 147 html("</td></tr>\n");
117 } 148 }
118 return 0; 149 return 0;
119} 150}
120 151
121static void print_refs_link(char *path) 152static void print_refs_link(char *path)
122{ 153{
123 html("<tr class='nohover'><td colspan='4'>"); 154 html("<tr class='nohover'><td colspan='4'>");
124 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); 155 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
125 html("</td></tr>"); 156 html("</td></tr>");
126} 157}
127 158
128void cgit_print_branches(int maxcount) 159void cgit_print_branches(int maxcount)
129{ 160{
130 struct reflist list; 161 struct reflist list;
131 int i; 162 int i;
132 163
133 html("<tr class='nohover'><th class='left'>Branch</th>" 164 html("<tr class='nohover'><th class='left'>Branch</th>"
134 "<th class='left'>Commit message</th>" 165 "<th class='left'>Commit message</th>"
135 "<th class='left'>Author</th>" 166 "<th class='left'>Author</th>"
136 "<th class='left' colspan='2'>Age</th></tr>\n"); 167 "<th class='left' colspan='2'>Age</th></tr>\n");
137 168
138 list.refs = NULL; 169 list.refs = NULL;