Merge branch 'full-log'

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 98009c019b497d4c4b5d4ec58dc5186fa03cac5c..2c13d5041b2a4931358b241b6316db3d96a9a6b5 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,6 +6,10 @@
  *   (see COPYING for full license text)
  */
 
  *   (see COPYING for full license text)
  */
 

+/* This is needed for strcasestr to be defined by <string.h> */
+#define _GNU_SOURCE 1
+#include <string.h>
+

 #include <time.h>
 
 #include "cgit.h"
 #include <time.h>
 
 #include "cgit.h"


@@ -19,7 +23,8 @@ time_t read_agefile(char *path)
 
        if (!(f = fopen(path, "r")))
                return -1;
 
        if (!(f = fopen(path, "r")))
                return -1;

-       fgets(buf, sizeof(buf), f);
+       if (fgets(buf, sizeof(buf), f) == NULL)
+               return -1;

        fclose(f);
        if (parse_date(buf, buf2, sizeof(buf2)))
                return strtoul(buf2, NULL, 10);
        fclose(f);
        if (parse_date(buf, buf2, sizeof(buf2)))
                return strtoul(buf2, NULL, 10);


@@ -27,21 +32,38 @@ time_t read_agefile(char *path)
                return 0;
 }
 
                return 0;
 }
 

-static void print_modtime(struct cgit_repo *repo)
+static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)

 {
        char *path;
        struct stat s;
 {
        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) {
        path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
        if (stat(path, &s) == 0) {

-               cgit_print_age(read_agefile(path), -1, NULL);
-               return;
+               *mtime = read_agefile(path);
+               r->mtime = *mtime;
+               return 1;

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

-       if (stat(path, &s) != 0)
-               return;
-       cgit_print_age(s.st_mtime, -1, NULL);
+       if (stat(path, &s) == 0)
+               *mtime = s.st_mtime;
+       else
+               *mtime = 0;
+
+       r->mtime = *mtime;
+       return (r->mtime != 0);
+}
+
+static void print_modtime(struct cgit_repo *repo)
+{
+       time_t t;
+       if (get_repo_modtime(repo, &t))
+               cgit_print_age(t, -1, NULL);

 }
 
 int is_match(struct cgit_repo *repo)
 }
 
 int is_match(struct cgit_repo *repo)


@@ -59,28 +81,128 @@ int is_match(struct cgit_repo *repo)
        return 0;
 }
 
        return 0;
 }
 

-void print_header(int columns)
+int is_in_url(struct cgit_repo *repo)

 {
 {

-       if (ctx.cfg.index_header) {
-               htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
-                     columns);
-               html_include(ctx.cfg.index_header);
-               html("</td></tr>");
+       if (!ctx.qry.url)
+               return 1;
+       if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
+               return 1;
+       return 0;
+}
+
+void print_sort_header(const char *title, const char *sort)
+{
+       htmlf("<th class='left'><a href='./?s=%s", sort);
+       if (ctx.qry.search) {
+               html("&q=");
+               html_url_arg(ctx.qry.search);

        }
        }

-       html("<tr class='nohover'>"
-            "<th class='left'>Name</th>"
-            "<th class='left'>Description</th>"
-            "<th class='left'>Owner</th>"
-            "<th class='left'>Idle</th>");
+       htmlf("'>%s</a></th>", title);
+}
+
+void print_header(int columns)
+{
+       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");
 }
 

+
+void print_pager(int items, int pagelen, char *search)
+{
+       int i;
+       html("<div class='pager'>");
+       for(i = 0; i * pagelen < items; i++)
+               cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
+                               search, i * pagelen);
+       html("</div>");
+}
+
+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_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;
+       time_t t1, t2;
+
+       t1 = t2 = 0;
+       get_repo_modtime(r1, &t1);
+       get_repo_modtime(r2, &t2);
+       return t2 - t1;
+}
+
+struct sortcolumn {
+       const char *name;
+       int (*fn)(const void *a, const void *b);
+};
+
+struct sortcolumn sortcolumn[] = {
+       {"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;
        char *last_group = NULL;
 void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;
        char *last_group = NULL;

+       int sorted = 0;

 
        if (ctx.cfg.enable_index_links)
                columns++;
 
        if (ctx.cfg.enable_index_links)
                columns++;


@@ -90,18 +212,29 @@ void cgit_print_repolist()
        cgit_print_docstart(&ctx);
        cgit_print_pageheader(&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);
+

        html("<table summary='repository list' class='list nowrap'>");
        for (i=0; i<cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];
        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))
+               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);
                        continue;
                if (!header++)
                        print_header(columns);

-               hits++;
-               if ((last_group == NULL && ctx.repo->group != NULL) ||
+               if (!sorted &&
+                   ((last_group == NULL && ctx.repo->group != NULL) ||

                    (last_group != NULL && ctx.repo->group == NULL) ||
                    (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))) {
+                    strcmp(ctx.repo->group, last_group)))) {

                        htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
                              columns);
                        html_txt(ctx.repo->group);
                        htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
                              columns);
                        html_txt(ctx.repo->group);


@@ -109,10 +242,8 @@ void cgit_print_repolist()
                        last_group = ctx.repo->group;
                }
                htmlf("<tr><td class='%s'>",
                        last_group = ctx.repo->group;
                }
                htmlf("<tr><td class='%s'>",

-                     ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
-               html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
-               html_txt(ctx.repo->name);
-               html_link_close();
+                     !sorted && ctx.repo->group ? "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("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
                html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);


@@ -124,11 +255,9 @@ void cgit_print_repolist()
                html("</td>");
                if (ctx.cfg.enable_index_links) {
                        html("<td>");
                html("</td>");
                if (ctx.cfg.enable_index_links) {
                        html("<td>");

-                       html_link_open(cgit_repourl(ctx.repo->url),
-                                      NULL, "button");
-                       html("summary</a>");
+                       cgit_summary_link("summary", NULL, "button", NULL);

                        cgit_log_link("log", NULL, "button", NULL, NULL, 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>");
                }


@@ -137,5 +266,13 @@ void cgit_print_repolist()
        html("</table>");
        if (!hits)
                cgit_print_error("No repositories found");
        html("</table>");
        if (!hits)
                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();
 }
        cgit_print_docend();
 }

+
+void cgit_print_site_readme()
+{
+       if (ctx.cfg.root_readme)
+               html_include(ctx.cfg.root_readme);
+}