author | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 18:09:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 18:09:42 (UTC) |
commit | ed7ff095ca467cdc4c8a1a1459847d68e50c9b91 (patch) (unidiff) | |
tree | 4ed7425520cb76eff0a4e7756869620b2562b6c9 | |
parent | 5632ba35d133ee29d46c031cdd4b4a37097b8ca1 (diff) | |
download | cgit-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>
-rw-r--r-- | cmd.c | 2 | ||||
-rw-r--r-- | ui-snapshot.c | 94 | ||||
-rw-r--r-- | ui-snapshot.h | 2 |
3 files changed, 83 insertions, 15 deletions
@@ -77,65 +77,65 @@ static void ls_cache_fn(struct cgit_context *ctx) | |||
77 | cache_ls(ctx->cfg.cache_root); | 77 | cache_ls(ctx->cfg.cache_root); |
78 | } | 78 | } |
79 | 79 | ||
80 | static void objects_fn(struct cgit_context *ctx) | 80 | static void objects_fn(struct cgit_context *ctx) |
81 | { | 81 | { |
82 | cgit_clone_objects(ctx); | 82 | cgit_clone_objects(ctx); |
83 | } | 83 | } |
84 | 84 | ||
85 | static void repolist_fn(struct cgit_context *ctx) | 85 | static void repolist_fn(struct cgit_context *ctx) |
86 | { | 86 | { |
87 | cgit_print_repolist(); | 87 | cgit_print_repolist(); |
88 | } | 88 | } |
89 | 89 | ||
90 | static void patch_fn(struct cgit_context *ctx) | 90 | static void patch_fn(struct cgit_context *ctx) |
91 | { | 91 | { |
92 | cgit_print_patch(ctx->qry.sha1); | 92 | cgit_print_patch(ctx->qry.sha1); |
93 | } | 93 | } |
94 | 94 | ||
95 | static void plain_fn(struct cgit_context *ctx) | 95 | static void plain_fn(struct cgit_context *ctx) |
96 | { | 96 | { |
97 | cgit_print_plain(ctx); | 97 | cgit_print_plain(ctx); |
98 | } | 98 | } |
99 | 99 | ||
100 | static void refs_fn(struct cgit_context *ctx) | 100 | static void refs_fn(struct cgit_context *ctx) |
101 | { | 101 | { |
102 | cgit_print_refs(); | 102 | cgit_print_refs(); |
103 | } | 103 | } |
104 | 104 | ||
105 | static void snapshot_fn(struct cgit_context *ctx) | 105 | 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 | ||
112 | static void summary_fn(struct cgit_context *ctx) | 112 | static void summary_fn(struct cgit_context *ctx) |
113 | { | 113 | { |
114 | cgit_print_summary(); | 114 | cgit_print_summary(); |
115 | } | 115 | } |
116 | 116 | ||
117 | static void tag_fn(struct cgit_context *ctx) | 117 | static void tag_fn(struct cgit_context *ctx) |
118 | { | 118 | { |
119 | cgit_print_tag(ctx->qry.sha1); | 119 | cgit_print_tag(ctx->qry.sha1); |
120 | } | 120 | } |
121 | 121 | ||
122 | static void tree_fn(struct cgit_context *ctx) | 122 | static void tree_fn(struct cgit_context *ctx) |
123 | { | 123 | { |
124 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); | 124 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); |
125 | } | 125 | } |
126 | 126 | ||
127 | #define def_cmd(name, want_repo, want_layout) \ | 127 | #define def_cmd(name, want_repo, want_layout) \ |
128 | {#name, name##_fn, want_repo, want_layout} | 128 | {#name, name##_fn, want_repo, want_layout} |
129 | 129 | ||
130 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 130 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
131 | { | 131 | { |
132 | static struct cgit_cmd cmds[] = { | 132 | static struct cgit_cmd cmds[] = { |
133 | def_cmd(HEAD, 1, 0), | 133 | def_cmd(HEAD, 1, 0), |
134 | def_cmd(atom, 1, 0), | 134 | def_cmd(atom, 1, 0), |
135 | def_cmd(about, 0, 1), | 135 | def_cmd(about, 0, 1), |
136 | def_cmd(blob, 1, 0), | 136 | def_cmd(blob, 1, 0), |
137 | def_cmd(commit, 1, 1), | 137 | def_cmd(commit, 1, 1), |
138 | def_cmd(diff, 1, 1), | 138 | def_cmd(diff, 1, 1), |
139 | def_cmd(info, 1, 0), | 139 | def_cmd(info, 1, 0), |
140 | def_cmd(log, 1, 1), | 140 | def_cmd(log, 1, 1), |
141 | def_cmd(ls_cache, 0, 0), | 141 | def_cmd(ls_cache, 0, 0), |
diff --git a/ui-snapshot.c b/ui-snapshot.c index 7a597ff..9c4d086 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -35,86 +35,154 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f | |||
35 | 35 | ||
36 | rv = write_tar_archive(args); | 36 | rv = write_tar_archive(args); |
37 | 37 | ||
38 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); | 38 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); |
39 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); | 39 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); |
40 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); | 40 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); |
41 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); | 41 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); |
42 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); | 42 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); |
43 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) | 43 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) |
44 | cgit_print_error("Failed to compress archive"); | 44 | cgit_print_error("Failed to compress archive"); |
45 | 45 | ||
46 | return rv; | 46 | return rv; |
47 | } | 47 | } |
48 | 48 | ||
49 | static int write_tar_gzip_archive(struct archiver_args *args) | 49 | static int write_tar_gzip_archive(struct archiver_args *args) |
50 | { | 50 | { |
51 | return write_compressed_tar_archive(args,"gzip"); | 51 | return write_compressed_tar_archive(args,"gzip"); |
52 | } | 52 | } |
53 | 53 | ||
54 | static int write_tar_bzip2_archive(struct archiver_args *args) | 54 | static int write_tar_bzip2_archive(struct archiver_args *args) |
55 | { | 55 | { |
56 | return write_compressed_tar_archive(args,"bzip2"); | 56 | return write_compressed_tar_archive(args,"bzip2"); |
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-tar", write_tar_gzip_archive, 0x2 }, |
62 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 62 | { ".tar.bz2", "application/x-tar", 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 | ||
67 | static 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 | |||
67 | static int make_snapshot(const struct cgit_snapshot_format *format, | 83 | static 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) |
70 | { | 86 | { |
71 | struct archiver_args args; | 87 | struct archiver_args args; |
72 | struct commit *commit; | 88 | struct commit *commit; |
73 | unsigned char sha1[20]; | 89 | unsigned char sha1[20]; |
74 | 90 | ||
75 | if(get_sha1(hex, sha1)) { | 91 | if(get_sha1(hex, sha1)) { |
76 | cgit_print_error(fmt("Bad object id: %s", hex)); | 92 | cgit_print_error(fmt("Bad object id: %s", hex)); |
77 | return 1; | 93 | return 1; |
78 | } | 94 | } |
79 | commit = lookup_commit_reference(sha1); | 95 | commit = lookup_commit_reference(sha1); |
80 | if(!commit) { | 96 | if(!commit) { |
81 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 97 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
82 | return 1; | 98 | return 1; |
83 | } | 99 | } |
84 | memset(&args, 0, sizeof(args)); | 100 | memset(&args, 0, sizeof(args)); |
85 | if (prefix) { | 101 | if (prefix) { |
86 | args.base = fmt("%s/", prefix); | 102 | args.base = fmt("%s/", prefix); |
87 | args.baselen = strlen(prefix) + 1; | 103 | args.baselen = strlen(prefix) + 1; |
88 | } else { | 104 | } else { |
89 | args.base = ""; | 105 | args.base = ""; |
90 | args.baselen = 0; | 106 | args.baselen = 0; |
91 | } | 107 | } |
92 | args.tree = commit->tree; | 108 | args.tree = commit->tree; |
93 | args.time = commit->date; | 109 | args.time = commit->date; |
94 | ctx.page.mimetype = xstrdup(format->mimetype); | 110 | ctx.page.mimetype = xstrdup(format->mimetype); |
95 | ctx.page.filename = xstrdup(filename); | 111 | ctx.page.filename = xstrdup(filename); |
96 | cgit_print_http_headers(&ctx); | 112 | cgit_print_http_headers(&ctx); |
97 | format->write_func(&args); | 113 | format->write_func(&args); |
98 | return 0; | 114 | return 0; |
99 | } | 115 | } |
100 | 116 | ||
117 | char *dwim_filename = NULL; | ||
118 | const char *dwim_refname = NULL; | ||
119 | |||
120 | static 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 | */ | ||
149 | static 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 | |||
101 | void cgit_print_snapshot(const char *head, const char *hex, const char *prefix, | 165 | void 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 | |||
@@ -1,8 +1,8 @@ | |||
1 | #ifndef UI_SNAPSHOT_H | 1 | #ifndef UI_SNAPSHOT_H |
2 | #define UI_SNAPSHOT_H | 2 | #define UI_SNAPSHOT_H |
3 | 3 | ||
4 | extern void cgit_print_snapshot(const char *head, const char *hex, | 4 | extern 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 */ |