summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-10-11 18:09:42 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-10-11 18:09:42 (UTC)
commited7ff095ca467cdc4c8a1a1459847d68e50c9b91 (patch) (unidiff)
tree4ed7425520cb76eff0a4e7756869620b2562b6c9
parent5632ba35d133ee29d46c031cdd4b4a37097b8ca1 (diff)
downloadcgit-ed7ff095ca467cdc4c8a1a1459847d68e50c9b91.zip
cgit-ed7ff095ca467cdc4c8a1a1459847d68e50c9b91.tar.gz
cgit-ed7ff095ca467cdc4c8a1a1459847d68e50c9b91.tar.bz2
ui-snapshot: add dwimmery
When downloading a snapshot, the snapshot name will often contain the repo name combined with a tag. This patch tries to exploit this so that the correct revision is downloaded even if no specific revision is specified. PS: this only occurs if neither 'h' nor 'id' is specified in the query- string. PPS: this also fixes a bug which occurs when trying to download a filename with an unsupported suffix: it used to try to print an error message to the user but failed since it didn't prepare the output properly. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cmd.c2
-rw-r--r--ui-snapshot.c94
-rw-r--r--ui-snapshot.h2
3 files changed, 83 insertions, 15 deletions
diff --git a/cmd.c b/cmd.c
index a989220..5b3c14c 100644
--- a/cmd.c
+++ b/cmd.c
@@ -106,7 +106,7 @@ static void snapshot_fn(struct cgit_context *ctx)
106{ 106{
107 cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, 107 cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1,
108 cgit_repobasename(ctx->repo->url), ctx->qry.path, 108 cgit_repobasename(ctx->repo->url), ctx->qry.path,
109 ctx->repo->snapshots); 109 ctx->repo->snapshots, ctx->qry.nohead);
110} 110}
111 111
112static void summary_fn(struct cgit_context *ctx) 112static void summary_fn(struct cgit_context *ctx)
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 7a597ff..9c4d086 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -64,6 +64,22 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = {
64 {} 64 {}
65}; 65};
66 66
67static const struct cgit_snapshot_format *get_format(const char *filename)
68{
69 const struct cgit_snapshot_format *fmt;
70 int fl, sl;
71
72 fl = strlen(filename);
73 for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
74 sl = strlen(fmt->suffix);
75 if (sl >= fl)
76 continue;
77 if (!strcmp(fmt->suffix, filename + fl - sl))
78 return fmt;
79 }
80 return NULL;
81}
82
67static int make_snapshot(const struct cgit_snapshot_format *format, 83static int make_snapshot(const struct cgit_snapshot_format *format,
68 const char *hex, const char *prefix, 84 const char *hex, const char *prefix,
69 const char *filename) 85 const char *filename)
@@ -98,23 +114,75 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
98 return 0; 114 return 0;
99} 115}
100 116
117char *dwim_filename = NULL;
118const char *dwim_refname = NULL;
119
120static int ref_cb(const char *refname, const unsigned char *sha1, int flags,
121 void *cb_data)
122{
123 const char *r = refname;
124 while (r && *r) {
125 fprintf(stderr, " cmp %s with %s:", dwim_filename, r);
126 if (!strcmp(dwim_filename, r)) {
127 fprintf(stderr, "MATCH!\n");
128 dwim_refname = refname;
129 return 1;
130 }
131 fprintf(stderr, "no match\n");
132 if (isdigit(*r))
133 break;
134 r++;
135 }
136 return 0;
137}
138
139/* Try to guess the requested revision by combining repo name and tag name
140 * and comparing this to the requested snapshot name. E.g. the requested
141 * snapshot is "cgit-0.7.2.tar.gz" while repo name is "cgit" and tag name
142 * is "v0.7.2". First, the reponame is stripped off, leaving "-0.7.2.tar.gz".
143 * Next, any '-' and '_' characters are stripped, leaving "0.7.2.tar.gz".
144 * Finally, the requested format suffix is removed and we end up with "0.7.2".
145 * Then we test each tag against this dwimmed filename, and for each tag
146 * we even try to remove any leading characters which are non-digits. I.e.
147 * we first compare with "v0.7.2", then with "0.7.2" and we've got a match.
148 */
149static const char *get_ref_from_filename(const char *url, const char *filename,
150 const struct cgit_snapshot_format *fmt)
151{
152 const char *reponame = cgit_repobasename(url);
153 fprintf(stderr, "reponame=%s, filename=%s\n", reponame, filename);
154 if (prefixcmp(filename, reponame))
155 return NULL;
156 filename += strlen(reponame);
157 while (filename && (*filename == '-' || *filename == '_'))
158 filename++;
159 dwim_filename = xstrdup(filename);
160 dwim_filename[strlen(filename) - strlen(fmt->suffix)] = '\0';
161 for_each_tag_ref(ref_cb, NULL);
162 return dwim_refname;
163}
164
101void cgit_print_snapshot(const char *head, const char *hex, const char *prefix, 165void cgit_print_snapshot(const char *head, const char *hex, const char *prefix,
102 const char *filename, int snapshots) 166 const char *filename, int snapshots, int dwim)
103{ 167{
104 const struct cgit_snapshot_format* f; 168 const struct cgit_snapshot_format* f;
105 int sl, fnl;
106 169
107 fnl = strlen(filename); 170 f = get_format(filename);
108 if (!hex) 171 if (!f) {
109 hex = head; 172 ctx.page.mimetype = "text/html";
110 for (f = cgit_snapshot_formats; f->suffix; f++) { 173 cgit_print_http_headers(&ctx);
111 if (!(snapshots & f->bit)) 174 cgit_print_docstart(&ctx);
112 continue; 175 cgit_print_pageheader(&ctx);
113 sl = strlen(f->suffix); 176 cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
114 if(fnl < sl || strcmp(&filename[fnl-sl], f->suffix)) 177 cgit_print_docend();
115 continue;
116 make_snapshot(f, hex, prefix, filename);
117 return; 178 return;
118 } 179 }
119 cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); 180
181 if (!hex && dwim)
182 hex = get_ref_from_filename(ctx.repo->url, filename, f);
183
184 if (!hex)
185 hex = head;
186
187 make_snapshot(f, hex, prefix, filename);
120} 188}
diff --git a/ui-snapshot.h b/ui-snapshot.h
index 6e03761..3540303 100644
--- a/ui-snapshot.h
+++ b/ui-snapshot.h
@@ -3,6 +3,6 @@
3 3
4extern void cgit_print_snapshot(const char *head, const char *hex, 4extern void cgit_print_snapshot(const char *head, const char *hex,
5 const char *prefix, const char *filename, 5 const char *prefix, const char *filename,
6 int snapshot); 6 int snapshot, int dwim);
7 7
8#endif /* UI_SNAPSHOT_H */ 8#endif /* UI_SNAPSHOT_H */