1 files changed, 44 insertions, 19 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 3aedde5..3ef2e99 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -13,29 +13,30 @@
 #include <time.h>
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 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)
 {
         char *path;
         struct stat s;
         struct cgit_repo *r = (struct cgit_repo *)repo;
 
@@ -130,16 +131,28 @@ static int cmp(const char *s1, const char *s2)
                 return strcmp(s1, s2);
         if (s1 && !s2)
                 return -1;
         if (s2 && !s1)
                 return 1;
         return 0;
 }
 
+static int sort_section(const void *a, const void *b)
+{
+        const struct cgit_repo *r1 = a;
+        const struct cgit_repo *r2 = b;
+        int result;
+
+        result = cmp(r1->section, r2->section);
+        if (!result)
+                result = cmp(r1->name, r2->name);
+        return result;
+}
+
 static int sort_name(const void *a, const void *b)
 {
         const struct cgit_repo *r1 = a;
         const struct cgit_repo *r2 = b;
 
         return cmp(r1->name, r2->name);
 }
 
@@ -172,16 +185,17 @@ static int sort_idle(const void *a, const void *b)
 }
 
 struct sortcolumn {
         const char *name;
         int (*fn)(const void *a, const void *b);
 };
 
 struct sortcolumn sortcolumn[] = {
+        {"section", sort_section},
         {"name", sort_name},
         {"desc", sort_desc},
         {"owner", sort_owner},
         {"idle", sort_idle},
         {NULL, NULL}
 };
 
 int sort_repolist(char *field)
@@ -197,58 +211,64 @@ int sort_repolist(char *field)
         }
         return 0;
 }
 
 
 void cgit_print_repolist()
 {
         int i, columns = 4, hits = 0, header = 0;
-        char *last_group = NULL;
+        char *last_section = NULL;
+        char *section;
         int sorted = 0;
 
         if (ctx.cfg.enable_index_links)
                 columns++;
 
         ctx.page.title = ctx.cfg.root_title;
         cgit_print_http_headers(&ctx);
         cgit_print_docstart(&ctx);
         cgit_print_pageheader(&ctx);
 
         if (ctx.cfg.index_header)
                 html_include(ctx.cfg.index_header);
 
         if(ctx.qry.sort)
                 sorted = sort_repolist(ctx.qry.sort);
+        else
+                sort_repolist("section");
 
         html("<table summary='repository list' class='list nowrap'>");
         for (i=0; i<cgit_repolist.count; i++) {
                 ctx.repo = &cgit_repolist.repos[i];
                 if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
                         continue;
                 hits++;
                 if (hits <= ctx.qry.ofs)
                         continue;
                 if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
                         continue;
                 if (!header++)
                         print_header(columns);
+                section = ctx.repo->section;
+                if (section && !strcmp(section, ""))
+                        section = NULL;
                 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 && section != NULL) ||
+                    (last_section != NULL && section == NULL) ||
+                    (last_section != NULL && section != NULL &&
+                     strcmp(section, last_section)))) {
+                        htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
                               columns);
-                        html_txt(ctx.repo->group);
+                        html_txt(section);
                         html("</td></tr>");
-                        last_group = ctx.repo->group;
+                        last_section = section;
                 }
                 htmlf("<tr><td class='%s'>",
-                      !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
+                      !sorted && 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);
                 html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                 html_link_close();
                 html("</td><td>");
                 html_txt(ctx.repo->owner);
                 html("</td><td>");
@@ -269,11 +289,16 @@ void cgit_print_repolist()
                 cgit_print_error("No repositories found");
         else if (hits > ctx.cfg.max_repo_count)
                 print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
         cgit_print_docend();
 }
 
 void cgit_print_site_readme()
 {
-        if (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);
 }