| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | cgit.h | 6 | ||||
| -rw-r--r-- | cgitrc | 5 | ||||
| -rw-r--r-- | shared.c | 4 | ||||
| -rw-r--r-- | ui-commit.c | 2 | ||||
| -rw-r--r-- | ui-snapshot.c | 43 |
6 files changed, 48 insertions, 15 deletions
@@ -67,13 +67,14 @@ static void cgit_print_repo_page(struct cacheitem *item) show_search = 0; setenv("GIT_DIR", cgit_repo->path, 1); if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { cgit_print_snapshot(item, cgit_query_sha1, cgit_repobasename(cgit_repo->url), - cgit_query_name); + cgit_query_name, + cgit_repo->snapshots ); return; } if (cgit_cmd == CMD_BLOB) { cgit_print_blob(item, cgit_query_sha1, cgit_query_path); return; @@ -232,10 +232,12 @@ extern void cgit_print_summary(); extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); extern void cgit_print_tree(const char *rev, char *path); extern void cgit_print_commit(char *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, - const char *prefix, const char *filename); -extern void cgit_print_snapshot_links(const char *repo, const char *hex); + const char *prefix, const char *filename, + 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 */ @@ -5,13 +5,14 @@ ## Uncomment and set to 1 to deactivate caching of generated pages. Mostly ## usefull for testing. #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 ## Enable/disable extra links to summary/log/tree per repo on index page #enable-index-links=0 @@ -110,11 +111,11 @@ ## repository section must start with repo.url). #repo.url=cgit #repo.name=cgit #repo.desc=the caching cgi for git #repo.path=/pub/git/cgit #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-linecount=0 # override the default linecount setting #repo.module-link=/git/%s/commit/?id=%s # override the standard module-link #repo.readme=info/web/readme # specify a file to include on summary page @@ -152,13 +152,13 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_module_link = xstrdup(value); else if (!strcmp(name, "virtual-root")) cgit_virtual_root = xstrdup(value); else if (!strcmp(name, "nocache")) cgit_nocache = atoi(value); else if (!strcmp(name, "snapshots")) - cgit_snapshots = atoi(value); + cgit_snapshots = cgit_parse_snapshots_mask(value); else if (!strcmp(name, "enable-index-links")) cgit_enable_index_links = atoi(value); else if (!strcmp(name, "enable-log-filecount")) cgit_enable_log_filecount = atoi(value); else if (!strcmp(name, "enable-log-linecount")) cgit_enable_log_linecount = atoi(value); @@ -194,13 +194,13 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_repo->desc = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.owner")) cgit_repo->owner = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.defbranch")) cgit_repo->defbranch = xstrdup(value); 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")) cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); else if (cgit_repo && !strcmp(name, "repo.module-link")) cgit_repo->module_link= xstrdup(value); diff --git a/ui-commit.c b/ui-commit.c index bf5e6dc..50e9e11 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -193,13 +193,13 @@ void cgit_print_commit(char *hex) cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex, sha1_to_hex(p->item->object.sha1), NULL); html(")</td></tr>"); } if (cgit_repo->snapshots) { 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("</table>\n"); html("<div class='commit-subject'>"); html_txt(info->subject); html("</div>"); diff --git a/ui-snapshot.c b/ui-snapshot.c index 053fd48..d6be55b 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -54,27 +54,31 @@ static int write_tar_bzip2_archive(struct archiver_args *args) } static const struct snapshot_archive_t { const char *suffix; const char *mimetype; write_archive_fn_t write_func; + int bit; } snapshot_archives[] = { - { ".zip", "application/x-zip", write_zip_archive }, - { ".tar.gz", "application/x-tar", write_tar_gzip_archive }, - { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }, - { ".tar", "application/x-tar", write_tar_archive } + { ".zip", "application/x-zip", write_zip_archive, 0x1 }, + { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, + { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, + { ".tar", "application/x-tar", write_tar_archive, 0x8 } }; 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 f; for(f=0;f<(sizeof(snapshot_archives)/sizeof(*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)) continue; struct archiver_args args; struct commit *commit; unsigned char sha1[20]; @@ -98,19 +102,44 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex, (*sat->write_func)(&args); return; } 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; int f; for(f=0;f<(sizeof(snapshot_archives)/sizeof(*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); htmlf("<a href='%s'>%s</a><br/>", cgit_fileurl(repo,"snapshot",filename, fmt("id=%s&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: */ |