-rw-r--r-- | ui-snapshot.c | 98 |
1 files changed, 52 insertions, 46 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 9c4d086..f25613e 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -57,10 +57,10 @@ static int write_tar_bzip2_archive(struct archiver_args *args) | |||
57 | } | 57 | } |
58 | 58 | ||
59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { | 59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { |
60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
61 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, | 61 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, |
62 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 62 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, |
63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, | 63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, |
64 | {} | 64 | {} |
65 | }; | 65 | }; |
66 | 66 | ||
@@ -113,60 +113,55 @@ static int make_snapshot(const struct cgit_snapshot_format *format, | |||
113 | format->write_func(&args); | 113 | format->write_func(&args); |
114 | return 0; | 114 | return 0; |
115 | } | 115 | } |
116 | 116 | ||
117 | char *dwim_filename = NULL; | 117 | /* Try to guess the requested revision from the requested snapshot name. |
118 | const char *dwim_refname = NULL; | 118 | * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become |
119 | 119 | * "cgit-0.7.2". If this is a valid commit object name we've got a winner. | |
120 | static int ref_cb(const char *refname, const unsigned char *sha1, int flags, | 120 | * Otherwise, if the snapshot name has a prefix matching the result from |
121 | void *cb_data) | 121 | * repo_basename(), we strip the basename and any following '-' and '_' |
122 | { | 122 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once |
123 | const char *r = refname; | 123 | * more. If this still isn't a valid commit object name, we check if pre- |
124 | while (r && *r) { | 124 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives |
125 | fprintf(stderr, " cmp %s with %s:", dwim_filename, r); | 125 | * us something valid. |
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 | */ | 126 | */ |
149 | static const char *get_ref_from_filename(const char *url, const char *filename, | 127 | static const char *get_ref_from_filename(const char *url, const char *filename, |
150 | const struct cgit_snapshot_format *fmt) | 128 | const struct cgit_snapshot_format *format) |
151 | { | 129 | { |
152 | const char *reponame = cgit_repobasename(url); | 130 | const char *reponame; |
153 | fprintf(stderr, "reponame=%s, filename=%s\n", reponame, filename); | 131 | unsigned char sha1[20]; |
154 | if (prefixcmp(filename, reponame)) | 132 | char *snapshot; |
133 | |||
134 | snapshot = xstrdup(filename); | ||
135 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; | ||
136 | fprintf(stderr, "snapshot=%s\n", snapshot); | ||
137 | |||
138 | if (get_sha1(snapshot, sha1) == 0) | ||
139 | return snapshot; | ||
140 | |||
141 | reponame = cgit_repobasename(url); | ||
142 | fprintf(stderr, "reponame=%s\n", reponame); | ||
143 | if (prefixcmp(snapshot, reponame) == 0) { | ||
144 | snapshot += strlen(reponame); | ||
145 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) | ||
146 | snapshot++; | ||
147 | } | ||
148 | |||
149 | if (get_sha1(snapshot, sha1) == 0) | ||
150 | return snapshot; | ||
151 | |||
152 | snapshot = fmt("v%s", snapshot); | ||
153 | if (get_sha1(snapshot, sha1) == 0) | ||
154 | return snapshot; | ||
155 | |||
155 | return NULL; | 156 | 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 | } | 157 | } |
164 | 158 | ||
165 | void cgit_print_snapshot(const char *head, const char *hex, const char *prefix, | 159 | void cgit_print_snapshot(const char *head, const char *hex, |
166 | const char *filename, int snapshots, int dwim) | 160 | const char *filename, int snapshots, int dwim) |
167 | { | 161 | { |
168 | const struct cgit_snapshot_format* f; | 162 | const struct cgit_snapshot_format* f; |
163 | char *prefix = NULL; | ||
169 | 164 | ||
170 | f = get_format(filename); | 165 | f = get_format(filename); |
171 | if (!f) { | 166 | if (!f) { |
172 | ctx.page.mimetype = "text/html"; | 167 | ctx.page.mimetype = "text/html"; |
@@ -177,12 +172,23 @@ void cgit_print_snapshot(const char *head, const char *hex, const char *prefix, | |||
177 | cgit_print_docend(); | 172 | cgit_print_docend(); |
178 | return; | 173 | return; |
179 | } | 174 | } |
180 | 175 | ||
181 | if (!hex && dwim) | 176 | if (!hex && dwim) { |
182 | hex = get_ref_from_filename(ctx.repo->url, filename, f); | 177 | hex = get_ref_from_filename(ctx.repo->url, filename, f); |
178 | if (hex == NULL) { | ||
179 | html_status(404, "Not found", 0); | ||
180 | return; | ||
181 | } | ||
182 | prefix = xstrdup(filename); | ||
183 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; | ||
184 | } | ||
183 | 185 | ||
184 | if (!hex) | 186 | if (!hex) |
185 | hex = head; | 187 | hex = head; |
186 | 188 | ||
189 | if (!prefix) | ||
190 | prefix = xstrdup(cgit_repobasename(ctx.repo->url)); | ||
191 | |||
187 | make_snapshot(f, hex, prefix, filename); | 192 | make_snapshot(f, hex, prefix, filename); |
193 | free(prefix); | ||
188 | } | 194 | } |