Extend repo summary with tag list

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 372b4364ec06eca79e4894133e998c69731c8e96..9535abc4128e47df2a57a19e3fbff97d650a3c0a 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -10,13 +10,35 @@
 
 const char cgit_version[] = CGIT_VERSION;
 
 
 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, 
+                          cache_safe_filename(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)) || 
            cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);
 static void cgit_print_repo_page(struct cacheitem *item)
 {
        if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
            cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);

-               cgit_print_pageheader(title);
+               cgit_print_pageheader(title, 0);

                cgit_print_error(fmt("Unable to scan repository: %s",
                                     strerror(errno)));
                cgit_print_docend();
                cgit_print_error(fmt("Unable to scan repository: %s",
                                     strerror(errno)));
                cgit_print_docend();


@@ -24,18 +46,23 @@ static void cgit_print_repo_page(struct cacheitem *item)
        }
        setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
        }
        setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);

+       int show_search = 0;
+       if (cgit_query_page && !strcmp(cgit_query_page, "log"))
+               show_search = 1;

        cgit_print_docstart(title, item);
        cgit_print_docstart(title, item);

-       cgit_print_pageheader(title);
+       cgit_print_pageheader(title, show_search);

        if (!cgit_query_page) {
                cgit_print_summary();
        } else if (!strcmp(cgit_query_page, "log")) {
        if (!cgit_query_page) {
                cgit_print_summary();
        } else if (!strcmp(cgit_query_page, "log")) {

-               cgit_print_log(cgit_query_head, cgit_query_ofs, 100);
+               cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search);

        } else if (!strcmp(cgit_query_page, "tree")) {
        } else if (!strcmp(cgit_query_page, "tree")) {

-               cgit_print_tree(cgit_query_sha1);
+               cgit_print_tree(cgit_query_sha1, cgit_query_path);

        } else if (!strcmp(cgit_query_page, "commit")) {
                cgit_print_commit(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "view")) {
                cgit_print_view(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "commit")) {
                cgit_print_commit(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "view")) {
                cgit_print_view(cgit_query_sha1);

+       } else if (!strcmp(cgit_query_page, "diff")) {
+               cgit_print_diff(cgit_query_sha1, cgit_query_sha2);

        }
        cgit_print_docend();
 }
        }
        cgit_print_docend();
 }


@@ -58,7 +85,6 @@ static void cgit_check_cache(struct cacheitem *item)
 {
        int i = 0;
 
 {
        int i = 0;
 

-       cache_prepare(item);

  top:
        if (++i > cgit_max_lock_attempts) {
                die("cgit_refresh_cache: unable to lock %s: %s",
  top:
        if (++i > cgit_max_lock_attempts) {
                die("cgit_refresh_cache: unable to lock %s: %s",


@@ -147,6 +173,7 @@ int main(int argc, const char **argv)
        cgit_parse_args(argc, argv);
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
 
        cgit_parse_args(argc, argv);
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
 

+       cgit_prepare_cache(&item);

        if (cgit_nocache) {
                item.fd = STDOUT_FILENO;
                cgit_fill_cache(&item);
        if (cgit_nocache) {
                item.fd = STDOUT_FILENO;
                cgit_fill_cache(&item);