Introduce 'section' as canonical spelling for 'repo.group'

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 3aedde5456f761fe58926bfef7e28f389975aa41..4dea3b37a4a9317af7a75ad425ce32bfeee6ddd5 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -18,19 +18,20 @@
 
 time_t read_agefile(char *path)
 {
-       FILE *f;
-       static char buf[64], buf2[64];
+       time_t result;
+       size_t size;
+       char *buf;
+       static char buf2[64];
 
-       if (!(f = fopen(path, "r")))
+       if (readfile(path, &buf, &size))
                return -1;
-       buf[0] = 0;
-       if (fgets(buf, sizeof(buf), f) == NULL)
-               return -1;
-       fclose(f);
+
        if (parse_date(buf, buf2, sizeof(buf2)))
-               return strtoul(buf2, NULL, 10);
+               result = strtoul(buf2, NULL, 10);
        else
-               return 0;
+               result = 0;
+       free(buf);
+       return result;
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
@@ -202,7 +203,7 @@ int sort_repolist(char *field)
 void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;
-       char *last_group = NULL;
+       char *last_section = NULL;
        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)
@@ -232,18 +233,18 @@ void cgit_print_repolist()
                if (!header++)
                        print_header(columns);
                if (!sorted &&
-                   ((last_group == NULL && ctx.repo->group != NULL) ||
-                   (last_group != NULL && ctx.repo->group == NULL) ||
-                   (last_group != NULL && ctx.repo->group != NULL &&
-                    strcmp(ctx.repo->group, last_group)))) {
-                       htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
+                   ((last_section == NULL && ctx.repo->section != NULL) ||
+                   (last_section != NULL && ctx.repo->section == NULL) ||
+                   (last_section != NULL && ctx.repo->section != NULL &&
+                    strcmp(ctx.repo->section, last_section)))) {
+                       htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
                              columns);
-                       html_txt(ctx.repo->group);
+                       html_txt(ctx.repo->section);
                        html("</td></tr>");
-                       last_group = ctx.repo->group;
+                       last_section = ctx.repo->section;
                }
                htmlf("<tr><td class='%s'>",
-                     !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
+                     !sorted && ctx.repo->section ? "sublevel-repo" : "toplevel-repo");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
@@ -274,6 +275,11 @@ 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);
 }