Add 'about-filter' and 'repo.about-filter' options

These options can be used to execute a filter command on each about-page,
both top-level and for each repository (repo.about-filter can be used
to override the current about-filter).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

6 files changed, 28 insertions, 2 deletions

diff --git a/cgit.c b/cgit.c
index b3a98c1..cb1149d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -91,4 +91,6 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 ctx.cfg.cache_dynamic_ttl = atoi(value);
+        else if (!strcmp(name, "about-filter"))
+                ctx.cfg.about_filter = new_filter(value, 0);
         else if (!strcmp(name, "commit-filter"))
                 ctx.cfg.commit_filter = new_filter(value, 0);
@@ -147,4 +149,6 @@ void config_cb(const char *name, const char *value)
         else if (ctx.repo && !strcmp(name, "repo.module-link"))
                 ctx.repo->module_link= xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.about-filter"))
+                ctx.repo->about_filter = new_filter(value, 0);
         else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
                 ctx.repo->commit_filter = new_filter(value, 0);
diff --git a/cgit.h b/cgit.h
index f10ba05..b8f4850 100644
--- a/cgit.h
+++ b/cgit.h
@@ -74,4 +74,5 @@ struct cgit_repo {
         int max_stats;
         time_t mtime;
+        struct cgit_filter *about_filter;
         struct cgit_filter *commit_filter;
         struct cgit_filter *source_filter;
@@ -186,4 +187,5 @@ struct cgit_config {
         int summary_log;
         int summary_tags;
+        struct cgit_filter *about_filter;
         struct cgit_filter *commit_filter;
         struct cgit_filter *source_filter;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index ffb3e0f..d8e4b97 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -17,4 +17,11 @@ lines, and lines starting with '#', are ignored.
 GLOBAL SETTINGS
 ---------------
+about-filter::
+        Specifies a command which will be invoked to format the content of
+        about pages (both top-level and for each repository). The command will
+        get the content of the about-file on its STDIN, and the STDOUT from the
+        command will be included verbatim on the about page. Default value:
+        none.
+
 agefile::
         Specifies a path, relative to each repository path, which can be used
@@ -235,4 +242,7 @@ virtual-root::
 REPOSITORY SETTINGS
 -------------------
+repo.about-filter::
+        Override the default about-filter. Default value: <about-filter>.
+
 repo.clone-url::
         A list of space-separated urls which can be used to clone this repo.
diff --git a/shared.c b/shared.c
index 783604b..911a55a 100644
--- a/shared.c
+++ b/shared.c
@@ -63,4 +63,5 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->readme = NULL;
         ret->mtime = -1;
+        ret->about_filter = ctx.cfg.about_filter;
         ret->commit_filter = ctx.cfg.commit_filter;
         ret->source_filter = ctx.cfg.source_filter;
diff --git a/ui-repolist.c b/ui-repolist.c
index 2c13d50..25f076f 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -274,5 +274,10 @@ void cgit_print_repolist()
 void cgit_print_site_readme()
 {
-        if (ctx.cfg.root_readme)
-                html_include(ctx.cfg.root_readme);
+        if (!ctx.cfg.root_readme)
+                return;
+        if (ctx.cfg.about_filter)
+                cgit_open_filter(ctx.cfg.about_filter);
+        html_include(ctx.cfg.root_readme);
+        if (ctx.cfg.about_filter)
+                cgit_close_filter(ctx.cfg.about_filter);
 }
diff --git a/ui-summary.c b/ui-summary.c
index f2a9b46..a2c018e 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -84,5 +84,9 @@ void cgit_print_repo_readme(char *path)
                 tmp = ctx.repo->readme;
         html("<div id='summary'>");
+        if (ctx.repo->about_filter)
+                cgit_open_filter(ctx.repo->about_filter);
         html_include(tmp);
+        if (ctx.repo->about_filter)
+                cgit_close_filter(ctx.repo->about_filter);
         html("</div>");
 }