diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-01-12 00:00:15 +0100 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-01-12 00:00:15 +0100 |
| commit | 83a5f35a2724ee60bfd8c5679b98da7008272254 (patch) | |
| tree | b530ed30437c963e4e73db433d8a4e9dd9f7e7d6 /cgit.c | |
| parent | Use long instead of int when converting from TTL to seconds (diff) | |
| download | cgit-pink-83a5f35a2724ee60bfd8c5679b98da7008272254.tar.gz cgit-pink-83a5f35a2724ee60bfd8c5679b98da7008272254.zip | |
Move cache_prepare() to cgit
This moves some cgit-specific stuff away from cache.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | cgit.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c index 5dcba76..d975570 100644 --- a/cgit.c +++ b/cgit.c @@ -10,6 +10,28 @@ const char cgit_version[] = CGIT_VERSION; +static void cgit_prepare_cache(struct cacheitem *item) +{ + if (!cgit_query_repo) { + item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); + item->ttl = cgit_cache_root_ttl; + } else if (!cgit_query_page) { + item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, + cgit_query_repo)); + item->ttl = cgit_cache_repo_ttl; + } else { + item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, + cgit_query_repo, cgit_query_page, + cgit_querystring)); + if (cgit_query_has_symref) + item->ttl = cgit_cache_dynamic_ttl; + else if (cgit_query_has_sha1) + item->ttl = cgit_cache_static_ttl; + else + item->ttl = cgit_cache_repo_ttl; + } +} + static void cgit_print_repo_page(struct cacheitem *item) { if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || @@ -63,7 +85,6 @@ static void cgit_check_cache(struct cacheitem *item) { int i = 0; - cache_prepare(item); top: if (++i > cgit_max_lock_attempts) { die("cgit_refresh_cache: unable to lock %s: %s", @@ -152,8 +173,8 @@ int main(int argc, const char **argv) cgit_parse_args(argc, argv); cgit_parse_query(cgit_querystring, cgit_querystring_cb); + cgit_prepare_cache(&item); if (cgit_nocache) { - cache_prepare(&item); item.fd = STDOUT_FILENO; cgit_fill_cache(&item); } else { |