readme: Accept multiple candidates and test them.

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 0754bb7f99b8eee1f5febdb902b49e2c57470c82..2f8a822ad5c1b5414b99ffeec2573669b2ba9a46 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,6 +8,7 @@
  */
 
 #include "cgit.h"
+#include "ui-summary.h"
 #include "html.h"
 #include "ui-log.h"
 #include "ui-refs.h"
@@ -16,6 +17,7 @@
 static void print_url(char *base, char *suffix)
 {
        int columns = 3;
+       struct strbuf basebuf = STRBUF_INIT;
 
        if (ctx.repo->enable_log_filecount)
                columns++;
@@ -24,13 +26,16 @@ static void print_url(char *base, char *suffix)
 
        if (!base || !*base)
                return;
-       if (suffix && *suffix)
-               base = fmt("%s/%s", base, suffix);
+       if (suffix && *suffix) {
+               strbuf_addf(&basebuf, "%s/%s", base, suffix);
+               base = basebuf.buf;
+       }
        htmlf("<tr><td colspan='%d'><a href='", columns);
        html_url_path(base);
        html("'>");
        html_txt(base);
        html("</a></td></tr>\n");
+       strbuf_release(&basebuf);
 }
 
 static void print_urls(char *txt, char *suffix)
@@ -90,57 +95,71 @@ void cgit_print_summary()
        html("</table>");
 }
 
-void cgit_print_repo_readme(char *path)
+/* The caller must free filename and ref after calling this. */
+void cgit_parse_readme(const char *readme, const char *path, char **filename, char **ref, struct cgit_repo *repo)
 {
-       char *slash, *tmp, *colon, *ref;
+       const char *slash, *colon;
 
-       if (!ctx.repo->readme || !(*ctx.repo->readme))
-               return;
+       *filename = NULL;
+       *ref = NULL;
 
-       ref = NULL;
+       if (!readme || !(*readme))
+               return;
 
        /* Check if the readme is tracked in the git repo. */
-       colon = strchr(ctx.repo->readme, ':');
+       colon = strchr(readme, ':');
        if (colon && strlen(colon) > 1) {
-               *colon = '\0';
-               ref = ctx.repo->readme;
-               ctx.repo->readme = colon + 1;
-               if (!(*ctx.repo->readme))
-                       return;
+               /* If it starts with a colon, we want to use
+                * the default branch */
+               if (colon == readme && repo->defbranch)
+                       *ref = xstrdup(repo->defbranch);
+               else
+                       *ref = xstrndup(readme, colon - readme);
+               readme = colon + 1;
        }
 
        /* Prepend repo path to relative readme path unless tracked. */
-       if (!ref && *ctx.repo->readme != '/')
-               ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
-                                              ctx.repo->readme));
+       if (!(*ref) && *readme != '/')
+               readme = fmtalloc("%s/%s", repo->path, readme);
 
        /* If a subpath is specified for the about page, make it relative
-        * to the directory containing the configured readme.
-        */
+        * to the directory containing the configured readme. */
        if (path) {
-               slash = strrchr(ctx.repo->readme, '/');
+               slash = strrchr(readme, '/');
                if (!slash) {
                        if (!colon)
                                return;
                        slash = colon;
                }
-               tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
-               strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
-               strcpy(tmp + (slash - ctx.repo->readme + 1), path);
+               *filename = xmalloc(slash - readme + 1 + strlen(path) + 1);
+               strncpy(*filename, readme, slash - readme + 1);
+               strcpy(*filename + (slash - readme + 1), path);
        } else
-               tmp = ctx.repo->readme;
+               *filename = xstrdup(readme);
+}
+
+void cgit_print_repo_readme(char *path)
+{
+       char *filename, *ref;
+       cgit_parse_readme(ctx.repo->readme, path, &filename, &ref, ctx.repo);
 
        /* Print the calculated readme, either from the git repo or from the
         * filesystem, while applying the about-filter.
         */
        html("<div id='summary'>");
-       if (ctx.repo->about_filter)
+       if (ctx.repo->about_filter) {
+               ctx.repo->about_filter->argv[1] = filename;
                cgit_open_filter(ctx.repo->about_filter);
+       }
        if (ref)
-               cgit_print_file(tmp, ref);
+               cgit_print_file(filename, ref);
        else
-               html_include(tmp);
-       if (ctx.repo->about_filter)
+               html_include(filename);
+       if (ctx.repo->about_filter) {
                cgit_close_filter(ctx.repo->about_filter);
+               ctx.repo->about_filter->argv[1] = NULL;
+       }
        html("</div>");
+       free(filename);
+       free(ref);
 }