diff options
author | Benjamin Close | 2008-11-25 06:25:35 -0800 |
---|---|---|
committer | Lars Hjemli | 2008-11-29 13:25:54 +0100 |
commit | d71c0c725d7b5ddfc5b788d328a5fc7a27739662 (patch) | |
tree | c7b0e71793470987c05a278dc5ed011a4903f524 | |
parent | Merge branch 'stable' (diff) | |
download | cgit-d71c0c725d7b5ddfc5b788d328a5fc7a27739662.tar.gz cgit-d71c0c725d7b5ddfc5b788d328a5fc7a27739662.zip |
Add support for sorting by Age in the repolist
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-repolist.c | 39 |
3 files changed, 39 insertions, 3 deletions
diff --git a/cgit.c b/cgit.c index c82587b..e09c86e 100644 --- a/cgit.c +++ b/cgit.c | |||
@@ -154,6 +154,8 @@ static void querystring_cb(const char *name, const char *value) | |||
154 | ctx.qry.name = xstrdup(value); | 154 | ctx.qry.name = xstrdup(value); |
155 | } else if (!strcmp(name, "mimetype")) { | 155 | } else if (!strcmp(name, "mimetype")) { |
156 | ctx.qry.mimetype = xstrdup(value); | 156 | ctx.qry.mimetype = xstrdup(value); |
157 | } else if (!strcmp(name, "s")){ | ||
158 | ctx.qry.sort = xstrdup(value); | ||
157 | } | 159 | } |
158 | } | 160 | } |
159 | 161 | ||
diff --git a/cgit.h b/cgit.h index 91db98a..ea90833 100644 --- a/cgit.h +++ b/cgit.h | |||
@@ -121,6 +121,7 @@ struct cgit_query { | |||
121 | char *url; | 121 | char *url; |
122 | int ofs; | 122 | int ofs; |
123 | int nohead; | 123 | int nohead; |
124 | char *sort; | ||
124 | }; | 125 | }; |
125 | 126 | ||
126 | struct cgit_config { | 127 | struct cgit_config { |
diff --git a/ui-repolist.c b/ui-repolist.c index c23232c..312a7ee 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -75,7 +75,7 @@ void print_header(int columns) | |||
75 | "<th class='left'>Name</th>" | 75 | "<th class='left'>Name</th>" |
76 | "<th class='left'>Description</th>" | 76 | "<th class='left'>Description</th>" |
77 | "<th class='left'>Owner</th>" | 77 | "<th class='left'>Owner</th>" |
78 | "<th class='left'>Idle</th>"); | 78 | "<th class='left'><a href=\"?s=1\">Idle</a></th>"); |
79 | if (ctx.cfg.enable_index_links) | 79 | if (ctx.cfg.enable_index_links) |
80 | html("<th class='left'>Links</th>"); | 80 | html("<th class='left'>Links</th>"); |
81 | html("</tr>\n"); | 81 | html("</tr>\n"); |
@@ -92,6 +92,35 @@ void print_pager(int items, int pagelen, char *search) | |||
92 | html("</div>"); | 92 | html("</div>"); |
93 | } | 93 | } |
94 | 94 | ||
95 | static int cgit_reposort_modtime(const void *a, const void *b) | ||
96 | { | ||
97 | const struct cgit_repo *r1 = a; | ||
98 | const struct cgit_repo *r2 = b; | ||
99 | char *path; | ||
100 | struct stat s; | ||
101 | time_t t1, t2; | ||
102 | path = fmt("%s/%s", r1->path, ctx.cfg.agefile); | ||
103 | if (stat(path, &s) == 0) { | ||
104 | t1 = read_agefile(path); | ||
105 | } else { | ||
106 | path = fmt("%s/refs/heads/%s", r1->path, r1->defbranch); | ||
107 | if (stat(path, &s) != 0) | ||
108 | return 0; | ||
109 | t1 =s.st_mtime; | ||
110 | } | ||
111 | |||
112 | path = fmt("%s/%s", r2->path, ctx.cfg.agefile); | ||
113 | if (stat(path, &s) == 0) { | ||
114 | t2 = read_agefile(path); | ||
115 | } else { | ||
116 | path = fmt("%s/refs/heads/%s", r2->path, r2->defbranch); | ||
117 | if (stat(path, &s) != 0) | ||
118 | return 0; | ||
119 | t2 =s.st_mtime; | ||
120 | } | ||
121 | return t2-t1; | ||
122 | } | ||
123 | |||
95 | void cgit_print_repolist() | 124 | void cgit_print_repolist() |
96 | { | 125 | { |
97 | int i, columns = 4, hits = 0, header = 0; | 126 | int i, columns = 4, hits = 0, header = 0; |
@@ -108,6 +137,9 @@ void cgit_print_repolist() | |||
108 | if (ctx.cfg.index_header) | 137 | if (ctx.cfg.index_header) |
109 | html_include(ctx.cfg.index_header); | 138 | html_include(ctx.cfg.index_header); |
110 | 139 | ||
140 | if(ctx.qry.sort) | ||
141 | qsort(cgit_repolist.repos,cgit_repolist.count,sizeof(struct cgit_repo),cgit_reposort_modtime); | ||
142 | |||
111 | html("<table summary='repository list' class='list nowrap'>"); | 143 | html("<table summary='repository list' class='list nowrap'>"); |
112 | for (i=0; i<cgit_repolist.count; i++) { | 144 | for (i=0; i<cgit_repolist.count; i++) { |
113 | ctx.repo = &cgit_repolist.repos[i]; | 145 | ctx.repo = &cgit_repolist.repos[i]; |
@@ -120,10 +152,11 @@ void cgit_print_repolist() | |||
120 | continue; | 152 | continue; |
121 | if (!header++) | 153 | if (!header++) |
122 | print_header(columns); | 154 | print_header(columns); |
123 | if ((last_group == NULL && ctx.repo->group != NULL) || | 155 | if (!ctx.qry.sort && |
156 | ((last_group == NULL && ctx.repo->group != NULL) || | ||
124 | (last_group != NULL && ctx.repo->group == NULL) || | 157 | (last_group != NULL && ctx.repo->group == NULL) || |
125 | (last_group != NULL && ctx.repo->group != NULL && | 158 | (last_group != NULL && ctx.repo->group != NULL && |
126 | strcmp(ctx.repo->group, last_group))) { | 159 | strcmp(ctx.repo->group, last_group)))) { |
127 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", | 160 | htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", |
128 | columns); | 161 | columns); |
129 | html_txt(ctx.repo->group); | 162 | html_txt(ctx.repo->group); |