Add display of tree content w/ui-tree.c

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 52d9bd3acd505cd3e739b1c590813b11b1d050ac..ada488b66dec98696fe5547287b2957a6d19581f 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -10,80 +10,6 @@
 
 const char cgit_version[] = CGIT_VERSION;
 
-int htmlfd = 0;
-
-char *cgit_root         = "/usr/src/git";
-char *cgit_root_title   = "Git repository browser";
-char *cgit_css          = "/cgit.css";
-char *cgit_logo         = "/git-logo.png";
-char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
-char *cgit_virtual_root = NULL;
-
-char *cgit_cache_root   = "/var/cache/cgit";
-
-int cgit_max_lock_attempts     =  5;
-int cgit_cache_root_ttl        =  5;
-int cgit_cache_repo_ttl        =  5;
-int cgit_cache_dynamic_ttl     =  5;
-int cgit_cache_static_ttl      = -1;
-int cgit_cache_max_create_time =  5;
-
-char *cgit_repo_name    = NULL;
-char *cgit_repo_desc    = NULL;
-char *cgit_repo_owner   = NULL;
-
-int cgit_query_has_symref = 0;
-int cgit_query_has_sha1   = 0;
-
-char *cgit_querystring  = NULL;
-char *cgit_query_repo   = NULL;
-char *cgit_query_page   = NULL;
-char *cgit_query_head   = NULL;
-char *cgit_query_sha1   = NULL;
-
-struct cacheitem cacheitem;
-
-void cgit_global_config_cb(const char *name, const char *value)
-{
-       if (!strcmp(name, "root"))
-               cgit_root = xstrdup(value);
-       else if (!strcmp(name, "root-title"))
-               cgit_root_title = xstrdup(value);
-       else if (!strcmp(name, "css"))
-               cgit_css = xstrdup(value);
-       else if (!strcmp(name, "logo"))
-               cgit_logo = xstrdup(value);
-       else if (!strcmp(name, "logo-link"))
-               cgit_logo_link = xstrdup(value);
-       else if (!strcmp(name, "virtual-root"))
-               cgit_virtual_root = xstrdup(value);
-}
-
-void cgit_repo_config_cb(const char *name, const char *value)
-{
-       if (!strcmp(name, "name"))
-               cgit_repo_name = xstrdup(value);
-       else if (!strcmp(name, "desc"))
-               cgit_repo_desc = xstrdup(value);
-       else if (!strcmp(name, "owner"))
-               cgit_repo_owner = xstrdup(value);
-}
-
-void cgit_querystring_cb(const char *name, const char *value)
-{
-       if (!strcmp(name,"r"))
-               cgit_query_repo = xstrdup(value);
-       else if (!strcmp(name, "p"))
-               cgit_query_page = xstrdup(value);
-       else if (!strcmp(name, "h")) {
-               cgit_query_head = xstrdup(value);
-               cgit_query_has_symref = 1;
-       } else if (!strcmp(name, "id")) {
-               cgit_query_sha1 = xstrdup(value);
-               cgit_query_has_sha1 = 1;
-       }
-}
-
 static void cgit_print_repo_page(struct cacheitem *item)
 {
        if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
@@ -100,10 +26,12 @@ static void cgit_print_repo_page(struct cacheitem *item)
        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
        cgit_print_docstart(title, item);
        cgit_print_pageheader(title);
-       if (!cgit_query_page)
+       if (!cgit_query_page) {
                cgit_print_summary();
-       else if (!strcmp(cgit_query_page, "log")) {
+       } else if (!strcmp(cgit_query_page, "log")) {
                cgit_print_log(cgit_query_head, 0, 100);
+       } else if (!strcmp(cgit_query_page, "tree")) {
+               cgit_print_tree(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "view")) {
                cgit_print_view(cgit_query_sha1);
        }
@@ -120,7 +48,7 @@ static void cgit_fill_cache(struct cacheitem *item)
                cgit_print_repolist(item);
 }
 
-static void cgit_refresh_cache(struct cacheitem *item)
+static void cgit_check_cache(struct cacheitem *item)
 {
        int i = 0;
 
@@ -135,13 +63,19 @@ static void cgit_refresh_cache(struct cacheitem *item)
                        sleep(1);
                        goto top;
                }
-               if (!cache_exist(item))
+               if (!cache_exist(item)) {
                        cgit_fill_cache(item);
-               cache_unlock(item);
+                       cache_unlock(item);
+               } else {
+                       cache_cancel_lock(item);
+               }
        } else if (cache_expired(item) && cache_lock(item)) {
-               if (cache_expired(item))
+               if (cache_expired(item)) {
                        cgit_fill_cache(item);
-               cache_unlock(item);
+                       cache_unlock(item);
+               } else {
+                       cache_cancel_lock(item);
+               }
        }
 }
 
@@ -162,10 +96,13 @@ static void cgit_print_cache(struct cacheitem *item)
 
 int main(int argc, const char **argv)
 {
+       struct cacheitem item;
+
        cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
        cgit_querystring = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
-       cgit_refresh_cache(&cacheitem);
-       cgit_print_cache(&cacheitem);
+
+       cgit_check_cache(&item);
+       cgit_print_cache(&item);
        return 0;
 }