scan-tree: Support gitweb.description.

Use gitweb.description instead of description file to determine
description, if option is enabled.

diff --git a/cgit.c b/cgit.c
index b9b3a668b9755de93311b1700d8a79cfc31f754a..ec5bbce1e45a766f34cf6f579c247adb6b3d7139 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -163,6 +163,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);
+       else if (!strcmp(name, "enable-gitweb-desc"))
+               ctx.cfg.enable_gitweb_desc = atoi(value);
        else if (!strcmp(name, "enable-gitweb-owner"))
                ctx.cfg.enable_gitweb_owner = atoi(value);
        else if (!strcmp(name, "enable-http-clone"))
@@ -336,6 +338,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/cgit.png";
        ctx->cfg.local_time = 0;
+       ctx->cfg.enable_gitweb_desc = 1;
        ctx->cfg.enable_gitweb_owner = 1;
        ctx->cfg.enable_http_clone = 1;
        ctx->cfg.enable_tree_linenumbers = 1;

diff --git a/cgit.h b/cgit.h
index 6ee6769cf2475a0119aa15539a134397cc28f329..f4d0e52454e77965c81e531cda9936b6cd42847d 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -199,6 +199,7 @@ struct cgit_config {
        int embedded;
        int enable_filter_overrides;
        int enable_gitweb_owner;
+       int enable_gitweb_desc;
        int enable_http_clone;
        int enable_index_links;
        int enable_commit_graph;

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index a72241ff6b38a1952884bbfcea1a686cad338b33..86a19a93ccf6b80fc0ebbb49e842e55d780b7531 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -106,6 +106,13 @@ enable-filter-overrides::
        Flag which, when set to "1", allows all filter settings to be
        overridden in repository-specific cgitrc files. Default value: none.
 
+enable-gitweb-desc::
+       If set to "1" and scan-path is enabled, we first check each repository
+       for the git config value "gitweb.description" to determine the owner.
+       Otherwise, the description is read from a file titled "description"
+       inside of the repository directory.
+       Default value: "1". See also: scan-path.
+
 enable-gitweb-owner::
        If set to "1" and scan-path is enabled, we first check each repository
        for the git config value "gitweb.owner" to determine the owner.

diff --git a/scan-tree.c b/scan-tree.c
index 378d795e854a3965c38673939fd3785f6e3fe92e..3d4e417edd8cf45631f7715d6c8f735d902def9a 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -48,19 +48,24 @@ static int is_git_dir(const char *path)
 struct cgit_repo *repo;
 repo_config_fn config_fn;
 char *owner;
+char *desc;
 
 static void repo_config(const char *name, const char *value)
 {
        config_fn(repo, name, value);
 }
 
-static int git_owner_config(const char *key, const char *value, void *cb)
+static int gitweb_config(const char *key, const char *value, void *cb)
 {
-       if (!strcmp(key, "gitweb.owner"))
+       if (ctx.cfg.enable_gitweb_owner && !strcmp(key, "gitweb.owner"))
                owner = xstrdup(value);
+       else if (ctx.cfg.enable_gitweb_desc && !strcmp(key, "gitweb.description"))
+               desc = xstrdup(value);
        return 0;
 }
 
+
+
 static char *xstrrchr(char *s, char *from, int c)
 {
        while (from >= s && *from != c)
@@ -89,8 +94,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                return;
 
        owner = NULL;
-       if (ctx.cfg.enable_gitweb_owner)
-               git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
+       desc = NULL;
+       git_config_from_file(gitweb_config, fmt("%s/config", path), NULL);
+       
        if (base == path)
                rel = xstrdup(fmt("%s", path));
        else
@@ -118,9 +124,13 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        }
        repo->owner = owner;
 
-       p = fmt("%s/description", path);
-       if (!stat(p, &st))
-               readfile(p, &repo->desc, &size);
+       if (desc)
+               repo->desc = desc;
+       else {
+               p = fmt("%s/description", path);
+               if (!stat(p, &st))
+                       readfile(p, &repo->desc, &size);
+       }
 
        if (!repo->readme) {
                p = fmt("%s/README.html", path);