Add separate header-files for each page/view

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 52d9bd3acd505cd3e739b1c590813b11b1d050ac..79e0e430db79691e1735dbeb2cf4d7400b7e5bc0 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -7,126 +7,197 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "cmd.h"

 
 

-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;
+static int cgit_prepare_cache(struct cacheitem *item)
+{
+       if (!ctx.repo && ctx.qry.repo) {
+               ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
+                                     "Bad request");
+               cgit_print_http_headers(&ctx);
+               cgit_print_docstart(&ctx);
+               cgit_print_pageheader(&ctx);
+               cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
+               cgit_print_docend();
+               return 0;
+       }

 
 

-int cgit_query_has_symref = 0;
-int cgit_query_has_sha1   = 0;
+       if (!ctx.repo) {
+               item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root));
+               item->ttl = ctx.cfg.cache_root_ttl;
+               return 1;
+       }

 
 

-char *cgit_querystring  = NULL;
-char *cgit_query_repo   = NULL;
-char *cgit_query_page   = NULL;
-char *cgit_query_head   = NULL;
-char *cgit_query_sha1   = NULL;
+       if (!cgit_cmd) {
+               item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
+                                        cache_safe_filename(ctx.repo->url),
+                                        cache_safe_filename(ctx.qry.raw)));
+               item->ttl = ctx.cfg.cache_repo_ttl;
+       } else {
+               item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
+                                        cache_safe_filename(ctx.repo->url),
+                                        ctx.qry.page,
+                                        cache_safe_filename(ctx.qry.raw)));
+               if (ctx.qry.has_symref)
+                       item->ttl = ctx.cfg.cache_dynamic_ttl;
+               else if (ctx.qry.has_sha1)
+                       item->ttl = ctx.cfg.cache_static_ttl;
+               else
+                       item->ttl = ctx.cfg.cache_repo_ttl;
+       }
+       return 1;
+}

 
 

-struct cacheitem cacheitem;
+struct refmatch {
+       char *req_ref;
+       char *first_ref;
+       int match;
+};

 
 

-void cgit_global_config_cb(const char *name, const char *value)
+int find_current_ref(const char *refname, const unsigned char *sha1,
+                    int flags, void *cb_data)

 {
 {

-       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);
+       struct refmatch *info;
+
+       info = (struct refmatch *)cb_data;
+       if (!strcmp(refname, info->req_ref))
+               info->match = 1;
+       if (!info->first_ref)
+               info->first_ref = xstrdup(refname);
+       return info->match;

 }
 
 }
 

-void cgit_repo_config_cb(const char *name, const char *value)
+char *find_default_branch(struct cgit_repo *repo)

 {
 {

-       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);
+       struct refmatch info;
+
+       info.req_ref = repo->defbranch;
+       info.first_ref = NULL;
+       info.match = 0;
+       for_each_branch_ref(find_current_ref, &info);
+       if (info.match)
+               return info.req_ref;
+       else
+               return info.first_ref;

 }
 
 }
 

-void cgit_querystring_cb(const char *name, const char *value)
+static int prepare_repo_cmd(struct cgit_context *ctx)

 {
 {

-       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;
+       char *tmp;
+       unsigned char sha1[20];
+       int nongit = 0;
+
+       setenv("GIT_DIR", ctx->repo->path, 1);
+       setup_git_directory_gently(&nongit);
+       if (nongit) {
+               ctx->page.title = fmt("%s - %s", ctx->cfg.root_title,
+                                     "config error");
+               tmp = fmt("Not a git repository: '%s'", ctx->repo->path);
+               ctx->repo = NULL;
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);
+               cgit_print_error(tmp);
+               cgit_print_docend();
+               return 1;
+       }
+       ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
+
+       if (!ctx->qry.head) {
+               ctx->qry.head = xstrdup(find_default_branch(ctx->repo));
+               ctx->repo->defbranch = ctx->qry.head;
+       }
+
+       if (!ctx->qry.head) {
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);
+               cgit_print_error("Repository seems to be empty");
+               cgit_print_docend();
+               return 1;
+       }
+
+       if (get_sha1(ctx->qry.head, sha1)) {
+               tmp = xstrdup(ctx->qry.head);
+               ctx->qry.head = ctx->repo->defbranch;
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);
+               cgit_print_error(fmt("Invalid branch: %s", tmp));
+               cgit_print_docend();
+               return 1;

        }
        }

+       return 0;

 }
 
 }
 

-static void cgit_print_repo_page(struct cacheitem *item)
+static void process_request(struct cgit_context *ctx)

 {
 {

-       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_error(fmt("Unable to scan repository: %s",
-                                    strerror(errno)));
+       struct cgit_cmd *cmd;
+
+       cmd = cgit_get_cmd(ctx);
+       if (!cmd) {
+               ctx->page.title = "cgit error";
+               ctx->repo = NULL;
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);
+               cgit_print_error("Invalid request");

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

-       setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
-       char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
-       cgit_print_docstart(title, item);
-       cgit_print_pageheader(title);
-       if (!cgit_query_page)
-               cgit_print_summary();
-       else if (!strcmp(cgit_query_page, "log")) {
-               cgit_print_log(cgit_query_head, 0, 100);
-       } else if (!strcmp(cgit_query_page, "view")) {
-               cgit_print_view(cgit_query_sha1);
+
+       if (cmd->want_repo && prepare_repo_cmd(ctx))
+               return;
+
+       if (cmd->want_layout) {
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);

        }
        }

-       cgit_print_docend();
+
+       cmd->fn(ctx);
+
+       if (cmd->want_layout)
+               cgit_print_docend();

 }
 
 }
 

-static void cgit_fill_cache(struct cacheitem *item)
+static long ttl_seconds(long ttl)

 {
 {

-       htmlfd = item->fd;
-       item->st.st_mtime = time(NULL);
-       if (cgit_query_repo)
-               cgit_print_repo_page(item);
+       if (ttl<0)
+               return 60 * 60 * 24 * 365;

        else
        else

-               cgit_print_repolist(item);
+               return ttl * 60;

 }
 
 }
 

-static void cgit_refresh_cache(struct cacheitem *item)
+static void cgit_fill_cache(struct cacheitem *item, int use_cache)
+{
+       int stdout2;
+
+       if (use_cache) {
+               stdout2 = chk_positive(dup(STDOUT_FILENO),
+                                      "Preserving STDOUT");
+               chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
+               chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
+       }
+
+       ctx.page.modified = time(NULL);
+       ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl);
+       process_request(&ctx);
+
+       if (use_cache) {
+               chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
+               chk_positive(dup2(stdout2, STDOUT_FILENO),
+                            "Restoring original STDOUT");
+               chk_zero(close(stdout2), "Closing temporary STDOUT");
+       }
+}
+
+static void cgit_check_cache(struct cacheitem *item)

 {
        int i = 0;
 
 {
        int i = 0;
 

-       cache_prepare(item);

  top:
  top:

-       if (++i > cgit_max_lock_attempts) {
+       if (++i > ctx.cfg.max_lock_attempts) {

                die("cgit_refresh_cache: unable to lock %s: %s",
                    item->name, strerror(errno));
        }
                die("cgit_refresh_cache: unable to lock %s: %s",
                    item->name, strerror(errno));
        }


@@ -135,13 +206,19 @@ static void cgit_refresh_cache(struct cacheitem *item)
                        sleep(1);
                        goto top;
                }
                        sleep(1);
                        goto top;
                }

-               if (!cache_exist(item))
-                       cgit_fill_cache(item);
-               cache_unlock(item);
+               if (!cache_exist(item)) {
+                       cgit_fill_cache(item, 1);
+                       cache_unlock(item);
+               } else {
+                       cache_cancel_lock(item);
+               }

        } else if (cache_expired(item) && cache_lock(item)) {
        } else if (cache_expired(item) && cache_lock(item)) {

-               if (cache_expired(item))
-                       cgit_fill_cache(item);
-               cache_unlock(item);
+               if (cache_expired(item)) {
+                       cgit_fill_cache(item, 1);
+                       cache_unlock(item);
+               } else {
+                       cache_cancel_lock(item);
+               }

        }
 }
 
        }
 }
 


@@ -160,12 +237,66 @@ static void cgit_print_cache(struct cacheitem *item)
        close(fd);
 }
 
        close(fd);
 }
 

+static void cgit_parse_args(int argc, const char **argv)
+{
+       int i;
+
+       for (i = 1; i < argc; i++) {
+               if (!strncmp(argv[i], "--cache=", 8)) {
+                       ctx.cfg.cache_root = xstrdup(argv[i]+8);
+               }
+               if (!strcmp(argv[i], "--nocache")) {
+                       ctx.cfg.nocache = 1;
+               }
+               if (!strncmp(argv[i], "--query=", 8)) {
+                       ctx.qry.raw = xstrdup(argv[i]+8);
+               }
+               if (!strncmp(argv[i], "--repo=", 7)) {
+                       ctx.qry.repo = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--page=", 7)) {
+                       ctx.qry.page = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--head=", 7)) {
+                       ctx.qry.head = xstrdup(argv[i]+7);
+                       ctx.qry.has_symref = 1;
+               }
+               if (!strncmp(argv[i], "--sha1=", 7)) {
+                       ctx.qry.sha1 = xstrdup(argv[i]+7);
+                       ctx.qry.has_sha1 = 1;
+               }
+               if (!strncmp(argv[i], "--ofs=", 6)) {
+                       ctx.qry.ofs = atoi(argv[i]+6);
+               }
+       }
+}
+

 int main(int argc, const char **argv)
 {
 int main(int argc, const char **argv)
 {

-       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);
+       struct cacheitem item;
+       const char *cgit_config_env = getenv("CGIT_CONFIG");
+
+       cgit_prepare_context(&ctx);
+       item.st.st_mtime = time(NULL);
+       cgit_repolist.length = 0;
+       cgit_repolist.count = 0;
+       cgit_repolist.repos = NULL;
+
+       cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
+                        cgit_global_config_cb);
+       if (getenv("SCRIPT_NAME"))
+               ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
+       if (getenv("QUERY_STRING"))
+               ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
+       cgit_parse_args(argc, argv);
+       cgit_parse_query(ctx.qry.raw, cgit_querystring_cb);
+       if (!cgit_prepare_cache(&item))
+               return 0;
+       if (ctx.cfg.nocache) {
+               cgit_fill_cache(&item, 0);
+       } else {
+               cgit_check_cache(&item);
+               cgit_print_cache(&item);
+       }

        return 0;
 }
        return 0;
 }