]> gitweb.ps.run Git - ps-cgit/blobdiff - cgit.c
Extend repo summary with tag list
[ps-cgit] / cgit.c
diff --git a/cgit.c b/cgit.c
index 30a9a2a133d43bd1a91f761120c9274ef7e02b26..9535abc4128e47df2a57a19e3fbff97d650a3c0a 100644 (file)
--- a/cgit.c
+++ b/cgit.c
 
 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)
+static void cgit_prepare_cache(struct cacheitem *item)
 {
-       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;
+       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_object(char *hex)
-{
-       unsigned char sha1[20];
-       //struct object *object;
-       char type[20];
-       unsigned char *buf;
-       unsigned long size;
-
-       if (get_sha1_hex(hex, sha1)){
-               cgit_print_error(fmt("Bad hex value: %s", hex));
-               return;
-       }
-
-       if (sha1_object_info(sha1, type, NULL)){
-               cgit_print_error("Bad object name");
-               return;
-       }
-
-       buf = read_sha1_file(sha1, type, &size);
-       if (!buf) {
-               cgit_print_error("Error reading object");
-               return;
-       }
-
-       buf[size] = '\0';
-       html("<h2>Object view</h2>");
-       htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size);
-       html("<pre>");
-       html_txt(buf);
-       html("</pre>");
-}
-
 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();
@@ -130,33 +46,45 @@ 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);
+       int show_search = 0;
+       if (cgit_query_page && !strcmp(cgit_query_page, "log"))
+               show_search = 1;
        cgit_print_docstart(title, item);
-       cgit_print_pageheader(title);
-       if (!cgit_query_page)
+       cgit_print_pageheader(title, show_search);
+       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, "log")) {
+               cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search);
+       } else if (!strcmp(cgit_query_page, "tree")) {
+               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_object(cgit_query_sha1);
+               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();
 }
 
 static void cgit_fill_cache(struct cacheitem *item)
 {
+       static char buf[PATH_MAX];
+
+       getcwd(buf, sizeof(buf));
        htmlfd = item->fd;
        item->st.st_mtime = time(NULL);
        if (cgit_query_repo)
                cgit_print_repo_page(item);
        else
                cgit_print_repolist(item);
+       chdir(buf);
 }
 
-static void cgit_refresh_cache(struct cacheitem *item)
+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",
@@ -167,13 +95,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);
+               }
        }
 }
 
@@ -192,12 +126,60 @@ static void cgit_print_cache(struct cacheitem *item)
        close(fd);
 }
 
+static void cgit_parse_args(int argc, const char **argv)
+{
+       int i;
+
+       for (i = 1; i < argc; i++) {
+               if (!strncmp(argv[i], "--root=", 7)) {
+                       cgit_root = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--cache=", 8)) {
+                       cgit_cache_root = xstrdup(argv[i]+8);
+               }
+               if (!strcmp(argv[i], "--nocache")) {
+                       cgit_nocache = 1;
+               }
+               if (!strncmp(argv[i], "--query=", 8)) {
+                       cgit_querystring = xstrdup(argv[i]+8);
+               }
+               if (!strncmp(argv[i], "--repo=", 7)) {
+                       cgit_query_repo = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--page=", 7)) {
+                       cgit_query_page = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--head=", 7)) {
+                       cgit_query_head = xstrdup(argv[i]+7);
+                       cgit_query_has_symref = 1;
+               }
+               if (!strncmp(argv[i], "--sha1=", 7)) {
+                       cgit_query_sha1 = xstrdup(argv[i]+7);
+                       cgit_query_has_sha1 = 1;
+               }
+               if (!strncmp(argv[i], "--ofs=", 6)) {
+                       cgit_query_ofs = atoi(argv[i]+6);
+               }
+       }
+}
+
 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"));
+       if (getenv("QUERY_STRING"))
+               cgit_querystring = xstrdup(getenv("QUERY_STRING"));
+       cgit_parse_args(argc, argv);
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
-       cgit_refresh_cache(&cacheitem);
-       cgit_print_cache(&cacheitem);
+
+       cgit_prepare_cache(&item);
+       if (cgit_nocache) {
+               item.fd = STDOUT_FILENO;
+               cgit_fill_cache(&item);
+       } else {
+               cgit_check_cache(&item);
+               cgit_print_cache(&item);
+       }
        return 0;
 }