Merge branch 'stable'

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 436a77432458a2613f6bf2b330b8ae28310d2e9b..2c98668ad931489ad54632d3c869c06de294f1cb 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,45 +6,53 @@
  *   (see COPYING for full license text)
  */
 
  *   (see COPYING for full license text)
  */
 

-#include <time.h>
-

 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 time_t read_agefile(char *path)
 {
 #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")))
-               return -1;
-       if (fgets(buf, sizeof(buf), f) == NULL)
+       if (readfile(path, &buf, &size))

                return -1;
                return -1;

-       fclose(f);
+

        if (parse_date(buf, buf2, sizeof(buf2)))
        if (parse_date(buf, buf2, sizeof(buf2)))

-               return strtoul(buf2, NULL, 10);
+               result = strtoul(buf2, NULL, 10);

        else
        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;
 }
 
 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;

 
 

+       if (repo->mtime != -1) {
+               *mtime = repo->mtime;
+               return 1;
+       }

        path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
        if (stat(path, &s) == 0) {
                *mtime = read_agefile(path);
        path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
        if (stat(path, &s) == 0) {
                *mtime = read_agefile(path);

+               r->mtime = *mtime;

                return 1;
        }
 
        path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
                return 1;
        }
 
        path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);

-       if (stat(path, &s) == 0) {
+       if (stat(path, &s) == 0)

                *mtime = s.st_mtime;
                *mtime = s.st_mtime;

-               return 1;
-       }
-       return 0;
+       else
+               *mtime = 0;
+
+       r->mtime = *mtime;
+       return (r->mtime != 0);

 }
 
 static void print_modtime(struct cgit_repo *repo)
 }
 
 static void print_modtime(struct cgit_repo *repo)


@@ -78,13 +86,23 @@ int is_in_url(struct cgit_repo *repo)
        return 0;
 }
 
        return 0;
 }
 

+void print_sort_header(const char *title, const char *sort)
+{
+       htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
+       if (ctx.qry.search) {
+               html("&q=");
+               html_url_arg(ctx.qry.search);
+       }
+       htmlf("'>%s</a></th>", title);
+}
+

 void print_header(int columns)
 {
 void print_header(int columns)
 {

-       html("<tr class='nohover'>"
-            "<th class='left'>Name</th>"
-            "<th class='left'>Description</th>"
-            "<th class='left'>Owner</th>"
-            "<th class='left'><a href=\"?s=1\">Idle</a></th>");
+       html("<tr class='nohover'>");
+       print_sort_header("Name", "name");
+       print_sort_header("Description", "desc");
+       print_sort_header("Owner", "owner");
+       print_sort_header("Idle", "idle");

        if (ctx.cfg.enable_index_links)
                html("<th class='left'>Links</th>");
        html("</tr>\n");
        if (ctx.cfg.enable_index_links)
                html("<th class='left'>Links</th>");
        html("</tr>\n");


@@ -101,7 +119,54 @@ void print_pager(int items, int pagelen, char *search)
        html("</div>");
 }
 
        html("</div>");
 }
 

-static int cgit_reposort_modtime(const void *a, const void *b)
+static int cmp(const char *s1, const char *s2)
+{
+       if (s1 && 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);
+}
+
+static int sort_desc(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+
+       return cmp(r1->desc, r2->desc);
+}
+
+static int sort_owner(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+
+       return cmp(r1->owner, r2->owner);
+}
+
+static int sort_idle(const void *a, const void *b)

 {
        const struct cgit_repo *r1 = a;
        const struct cgit_repo *r2 = b;
 {
        const struct cgit_repo *r1 = a;
        const struct cgit_repo *r2 = b;


@@ -113,10 +178,41 @@ static int cgit_reposort_modtime(const void *a, const void *b)
        return t2 - t1;
 }
 
        return t2 - t1;
 }
 

+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)
+{
+       struct sortcolumn *column;
+
+       for (column = &sortcolumn[0]; column->name; column++) {
+               if (strcmp(field, column->name))
+                       continue;
+               qsort(cgit_repolist.repos, cgit_repolist.count,
+                       sizeof(struct cgit_repo), column->fn);
+               return 1;
+       }
+       return 0;
+}
+
+

 void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 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++;
 
        if (ctx.cfg.enable_index_links)
                columns++;


@@ -130,7 +226,9 @@ void cgit_print_repolist()
                html_include(ctx.cfg.index_header);
 
        if(ctx.qry.sort)
                html_include(ctx.cfg.index_header);
 
        if(ctx.qry.sort)

-               qsort(cgit_repolist.repos,cgit_repolist.count,sizeof(struct cgit_repo),cgit_reposort_modtime);
+               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++) {
 
        html("<table summary='repository list' class='list nowrap'>");
        for (i=0; i<cgit_repolist.count; i++) {


@@ -144,19 +242,22 @@ void cgit_print_repolist()
                        continue;
                if (!header++)
                        print_header(columns);
                        continue;
                if (!header++)
                        print_header(columns);

-               if (!ctx.qry.sort &&
-                   ((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'>",
+               section = ctx.repo->section;
+               if (section && !strcmp(section, ""))
+                       section = NULL;
+               if (!sorted &&
+                   ((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);
                              columns);

-                       html_txt(ctx.repo->group);
+                       html_txt(section);

                        html("</td></tr>");
                        html("</td></tr>");

-                       last_group = ctx.repo->group;
+                       last_section = section;

                }
                htmlf("<tr><td class='%s'>",
                }
                htmlf("<tr><td class='%s'>",

-                     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);
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);


@@ -171,7 +272,7 @@ void cgit_print_repolist()
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,

-                                     0, NULL, NULL);
+                                     0, NULL, NULL, ctx.qry.showmsg);

                        cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                        html("</td>");
                }
                        cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                        html("</td>");
                }


@@ -187,6 +288,11 @@ void cgit_print_repolist()
 
 void cgit_print_site_readme()
 {
 
 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);

 }
 }