-rw-r--r-- | ui-snapshot.c | 101 |
1 files changed, 29 insertions, 72 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index dfedd8f..966a140 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -9,2 +9,4 @@ | |||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | ||
11 | #include "ui-shared.h" | ||
10 | 12 | ||
@@ -56,8 +58,3 @@ static int write_tar_bzip2_archive(struct archiver_args *args) | |||
56 | 58 | ||
57 | static const struct snapshot_archive_t { | 59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { |
58 | const char *suffix; | ||
59 | const char *mimetype; | ||
60 | write_archive_fn_t write_func; | ||
61 | int bit; | ||
62 | }snapshot_archives[] = { | ||
63 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
@@ -65,12 +62,10 @@ static const struct snapshot_archive_t { | |||
65 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 62 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, |
66 | { ".tar", "application/x-tar", write_tar_archive, 0x8 } | 63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, |
64 | {} | ||
67 | }; | 65 | }; |
68 | 66 | ||
69 | #define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) | 67 | static int make_snapshot(const struct cgit_snapshot_format *format, |
70 | |||
71 | void cgit_print_snapshot(struct cacheitem *item, const char *head, | ||
72 | const char *hex, const char *prefix, | 68 | const char *hex, const char *prefix, |
73 | const char *filename, int snapshots) | 69 | const char *filename) |
74 | { | 70 | { |
75 | const struct snapshot_archive_t* sat; | ||
76 | struct archiver_args args; | 71 | struct archiver_args args; |
@@ -78,16 +73,6 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, | |||
78 | unsigned char sha1[20]; | 73 | unsigned char sha1[20]; |
79 | int f, sl, fnl = strlen(filename); | ||
80 | 74 | ||
81 | for(f=0; f<snapshot_archives_len; f++) { | ||
82 | sat = &snapshot_archives[f]; | ||
83 | if(!(snapshots & sat->bit)) | ||
84 | continue; | ||
85 | sl = strlen(sat->suffix); | ||
86 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) | ||
87 | continue; | ||
88 | if (!hex) | ||
89 | hex = head; | ||
90 | if(get_sha1(hex, sha1)) { | 75 | if(get_sha1(hex, sha1)) { |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); | 76 | cgit_print_error(fmt("Bad object id: %s", hex)); |
92 | return; | 77 | return 1; |
93 | } | 78 | } |
@@ -96,3 +81,3 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, | |||
96 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 81 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
97 | return;; | 82 | return 1; |
98 | } | 83 | } |
@@ -102,56 +87,28 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, | |||
102 | args.time = commit->date; | 87 | args.time = commit->date; |
103 | cgit_print_snapshot_start(sat->mimetype, filename, item); | 88 | ctx.page.mimetype = xstrdup(format->mimetype); |
104 | (*sat->write_func)(&args); | 89 | ctx.page.filename = xstrdup(filename); |
105 | return; | 90 | cgit_print_http_headers(&ctx); |
106 | } | 91 | format->write_func(&args); |
107 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); | 92 | return 0; |
108 | } | 93 | } |
109 | 94 | ||
110 | void cgit_print_snapshot_links(const char *repo, const char *head, | 95 | void cgit_print_snapshot(const char *head, const char *hex, const char *prefix, |
111 | const char *hex, int snapshots) | 96 | const char *filename, int snapshots) |
112 | { | 97 | { |
113 | const struct snapshot_archive_t* sat; | 98 | const struct cgit_snapshot_format* f; |
114 | char *filename; | 99 | int sl, fnl; |
115 | int f; | ||
116 | 100 | ||
117 | for(f=0; f<snapshot_archives_len; f++) { | 101 | fnl = strlen(filename); |
118 | sat = &snapshot_archives[f]; | 102 | if (!hex) |
119 | if(!(snapshots & sat->bit)) | 103 | hex = head; |
104 | for (f = cgit_snapshot_formats; f->suffix; f++) { | ||
105 | if (!(snapshots & f->bit)) | ||
120 | continue; | 106 | continue; |
121 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 107 | sl = strlen(f->suffix); |
122 | sat->suffix); | 108 | if(fnl < sl || strcmp(&filename[fnl-sl], f->suffix)) |
123 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 109 | continue; |
124 | (char *)hex, filename); | 110 | make_snapshot(f, hex, prefix, filename); |
125 | html("<br/>"); | 111 | return; |
126 | } | ||
127 | } | ||
128 | |||
129 | int cgit_parse_snapshots_mask(const char *str) | ||
130 | { | ||
131 | const struct snapshot_archive_t* sat; | ||
132 | static const char *delim = " \t,:/|;"; | ||
133 | int f, tl, sl, rv = 0; | ||
134 | |||
135 | /* favor legacy setting */ | ||
136 | if(atoi(str)) | ||
137 | return 1; | ||
138 | for(;;) { | ||
139 | str += strspn(str,delim); | ||
140 | tl = strcspn(str,delim); | ||
141 | if(!tl) | ||
142 | break; | ||
143 | for(f=0; f<snapshot_archives_len; f++) { | ||
144 | sat = &snapshot_archives[f]; | ||
145 | sl = strlen(sat->suffix); | ||
146 | if((tl == sl && !strncmp(sat->suffix, str, tl)) || | ||
147 | (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) { | ||
148 | rv |= sat->bit; | ||
149 | break; | ||
150 | } | ||
151 | } | ||
152 | str += tl; | ||
153 | } | 112 | } |
154 | return rv; | 113 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); |
155 | } | 114 | } |
156 | |||
157 | /* vim:set sw=8: */ | ||