allow selective enabling of snapshots

snapshot configuration parameter now can be a
 space/slash/comma/colon/semicolon/pipe-separated list of snaphot suffixes as
 listed in ui-snapshot.c

Signed-off-by: Michael Krelin <hacker@klever.net>
This commit is contained in:
Michael Krelin 2007-07-21 18:00:53 +02:00
parent 97c025ae8e
commit dc3c9b5bc4
6 changed files with 48 additions and 15 deletions

3
cgit.c
View File

@ -70,7 +70,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
cgit_print_snapshot(item, cgit_query_sha1, cgit_print_snapshot(item, cgit_query_sha1,
cgit_repobasename(cgit_repo->url), cgit_repobasename(cgit_repo->url),
cgit_query_name); cgit_query_name,
cgit_repo->snapshots );
return; return;
} }

6
cgit.h
View File

@ -235,7 +235,9 @@ extern void cgit_print_tree(const char *rev, char *path);
extern void cgit_print_commit(char *hex); extern void cgit_print_commit(char *hex);
extern void cgit_print_diff(const char *new_hex, const char *old_hex); extern void cgit_print_diff(const char *new_hex, const char *old_hex);
extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
const char *prefix, const char *filename); const char *prefix, const char *filename,
extern void cgit_print_snapshot_links(const char *repo, const char *hex); int snapshot);
extern void cgit_print_snapshot_links(const char *repo, const char *hex,int snapshots);
extern int cgit_parse_snapshots_mask(const char *str);
#endif /* CGIT_H */ #endif /* CGIT_H */

5
cgitrc
View File

@ -8,7 +8,8 @@
#nocache=0 #nocache=0
## Enable/disable snapshots by default. This can be overridden per repo ## Set allowed snapshot types by default. Can be overridden per repo
# can be any combination of zip/tar.gz/tar.bz2/tar
#snapshots=0 #snapshots=0
@ -113,7 +114,7 @@
#repo.desc=the caching cgi for git #repo.desc=the caching cgi for git
#repo.path=/pub/git/cgit #repo.path=/pub/git/cgit
#repo.owner=Lars Hjemli #repo.owner=Lars Hjemli
#repo.snapshots=1 # override a sitewide snapshot-setting #repo.snapshots=tar.bz2 # override a sitewide snapshot-setting
#repo.enable-log-filecount=0 # override the default filecount setting #repo.enable-log-filecount=0 # override the default filecount setting
#repo.enable-log-linecount=0 # override the default linecount setting #repo.enable-log-linecount=0 # override the default linecount setting
#repo.module-link=/git/%s/commit/?id=%s # override the standard module-link #repo.module-link=/git/%s/commit/?id=%s # override the standard module-link

View File

@ -155,7 +155,7 @@ void cgit_global_config_cb(const char *name, const char *value)
else if (!strcmp(name, "nocache")) else if (!strcmp(name, "nocache"))
cgit_nocache = atoi(value); cgit_nocache = atoi(value);
else if (!strcmp(name, "snapshots")) else if (!strcmp(name, "snapshots"))
cgit_snapshots = atoi(value); cgit_snapshots = cgit_parse_snapshots_mask(value);
else if (!strcmp(name, "enable-index-links")) else if (!strcmp(name, "enable-index-links"))
cgit_enable_index_links = atoi(value); cgit_enable_index_links = atoi(value);
else if (!strcmp(name, "enable-log-filecount")) else if (!strcmp(name, "enable-log-filecount"))
@ -197,7 +197,7 @@ void cgit_global_config_cb(const char *name, const char *value)
else if (cgit_repo && !strcmp(name, "repo.defbranch")) else if (cgit_repo && !strcmp(name, "repo.defbranch"))
cgit_repo->defbranch = xstrdup(value); cgit_repo->defbranch = xstrdup(value);
else if (cgit_repo && !strcmp(name, "repo.snapshots")) else if (cgit_repo && !strcmp(name, "repo.snapshots"))
cgit_repo->snapshots = cgit_snapshots * atoi(value); cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))

View File

@ -196,7 +196,7 @@ void cgit_print_commit(char *hex)
} }
if (cgit_repo->snapshots) { if (cgit_repo->snapshots) {
html("<tr><th>download</th><td colspan='2' class='sha1'>"); html("<tr><th>download</th><td colspan='2' class='sha1'>");
cgit_print_snapshot_links(cgit_query_repo,hex); cgit_print_snapshot_links(cgit_query_repo,hex,cgit_repo->snapshots);
html("</td></tr>"); html("</td></tr>");
} }
html("</table>\n"); html("</table>\n");

View File

@ -57,21 +57,25 @@ static const struct snapshot_archive_t {
const char *suffix; const char *suffix;
const char *mimetype; const char *mimetype;
write_archive_fn_t write_func; write_archive_fn_t write_func;
int bit;
} snapshot_archives[] = { } snapshot_archives[] = {
{ ".zip", "application/x-zip", write_zip_archive }, { ".zip", "application/x-zip", write_zip_archive, 0x1 },
{ ".tar.gz", "application/x-tar", write_tar_gzip_archive }, { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 },
{ ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }, { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 },
{ ".tar", "application/x-tar", write_tar_archive } { ".tar", "application/x-tar", write_tar_archive, 0x8 }
}; };
void cgit_print_snapshot(struct cacheitem *item, const char *hex, void cgit_print_snapshot(struct cacheitem *item, const char *hex,
const char *prefix, const char *filename) const char *prefix, const char *filename,
int snapshots)
{ {
int fnl = strlen(filename); int fnl = strlen(filename);
int f; int f;
for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
const struct snapshot_archive_t* sat = &snapshot_archives[f]; const struct snapshot_archive_t* sat = &snapshot_archives[f];
int sl = strlen(sat->suffix); int sl;
if(!(snapshots&sat->bit)) continue;
sl = strlen(sat->suffix);
if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
continue; continue;
@ -101,16 +105,41 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex,
cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
} }
void cgit_print_snapshot_links(const char *repo,const char *hex) void cgit_print_snapshot_links(const char *repo,const char *hex,int snapshots)
{ {
char *filename; char *filename;
int f; int f;
for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
const struct snapshot_archive_t* sat = &snapshot_archives[f]; const struct snapshot_archive_t* sat = &snapshot_archives[f];
if(!(snapshots&sat->bit)) continue;
filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix); filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix);
htmlf("<a href='%s'>%s</a><br/>", htmlf("<a href='%s'>%s</a><br/>",
cgit_fileurl(repo,"snapshot",filename, cgit_fileurl(repo,"snapshot",filename,
fmt("id=%s&amp;name=%s",hex,filename)), filename); fmt("id=%s&amp;name=%s",hex,filename)), filename);
} }
} }
int cgit_parse_snapshots_mask(const char *str)
{
static const char *delim = " \t,:/|;";
int f, tl, rv = 0;
/* favor legacy setting */
if(atoi(str)) return 1;
for(;;) {
str += strspn(str,delim);
tl = strcspn(str,delim);
if(!tl)
break;
for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
const struct snapshot_archive_t* sat = &snapshot_archives[f];
if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) {
rv |= sat->bit;
break;
}
}
str += tl;
}
return rv;
}
/* vim:set sw=8: */ /* vim:set sw=8: */