-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
@@ -149,16 +149,18 @@ static void querystring_cb(const char *name, const char *value) | |||
149 | } else if (!strcmp(name, "ofs")) { | 149 | } else if (!strcmp(name, "ofs")) { |
150 | ctx.qry.ofs = atoi(value); | 150 | ctx.qry.ofs = atoi(value); |
151 | } else if (!strcmp(name, "path")) { | 151 | } else if (!strcmp(name, "path")) { |
152 | ctx.qry.path = trim_end(value, '/'); | 152 | ctx.qry.path = trim_end(value, '/'); |
153 | } else if (!strcmp(name, "name")) { | 153 | } else if (!strcmp(name, "name")) { |
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 | ||
160 | static void prepare_context(struct cgit_context *ctx) | 162 | static void prepare_context(struct cgit_context *ctx) |
161 | { | 163 | { |
162 | memset(ctx, 0, sizeof(ctx)); | 164 | memset(ctx, 0, sizeof(ctx)); |
163 | ctx->cfg.agefile = "info/web/last-modified"; | 165 | ctx->cfg.agefile = "info/web/last-modified"; |
164 | ctx->cfg.nocache = 0; | 166 | ctx->cfg.nocache = 0; |
@@ -116,16 +116,17 @@ struct cgit_query { | |||
116 | char *sha1; | 116 | char *sha1; |
117 | char *sha2; | 117 | char *sha2; |
118 | char *path; | 118 | char *path; |
119 | char *name; | 119 | char *name; |
120 | char *mimetype; | 120 | char *mimetype; |
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 { |
127 | char *agefile; | 128 | char *agefile; |
128 | char *cache_root; | 129 | char *cache_root; |
129 | char *clone_prefix; | 130 | char *clone_prefix; |
130 | char *css; | 131 | char *css; |
131 | char *favicon; | 132 | char *favicon; |
diff --git a/ui-repolist.c b/ui-repolist.c index c23232c..312a7ee 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -70,65 +70,98 @@ int is_in_url(struct cgit_repo *repo) | |||
70 | } | 70 | } |
71 | 71 | ||
72 | void print_header(int columns) | 72 | void print_header(int columns) |
73 | { | 73 | { |
74 | html("<tr class='nohover'>" | 74 | html("<tr class='nohover'>" |
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"); |
82 | } | 82 | } |
83 | 83 | ||
84 | 84 | ||
85 | void print_pager(int items, int pagelen, char *search) | 85 | void print_pager(int items, int pagelen, char *search) |
86 | { | 86 | { |
87 | int i; | 87 | int i; |
88 | html("<div class='pager'>"); | 88 | html("<div class='pager'>"); |
89 | for(i = 0; i * pagelen < items; i++) | 89 | for(i = 0; i * pagelen < items; i++) |
90 | cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, | 90 | cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL, |
91 | search, i * pagelen); | 91 | search, i * pagelen); |
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; |
98 | char *last_group = NULL; | 127 | char *last_group = NULL; |
99 | 128 | ||
100 | if (ctx.cfg.enable_index_links) | 129 | if (ctx.cfg.enable_index_links) |
101 | columns++; | 130 | columns++; |
102 | 131 | ||
103 | ctx.page.title = ctx.cfg.root_title; | 132 | ctx.page.title = ctx.cfg.root_title; |
104 | cgit_print_http_headers(&ctx); | 133 | cgit_print_http_headers(&ctx); |
105 | cgit_print_docstart(&ctx); | 134 | cgit_print_docstart(&ctx); |
106 | cgit_print_pageheader(&ctx); | 135 | cgit_print_pageheader(&ctx); |
107 | 136 | ||
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]; |
114 | if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) | 146 | if (!(is_match(ctx.repo) && is_in_url(ctx.repo))) |
115 | continue; | 147 | continue; |
116 | hits++; | 148 | hits++; |
117 | if (hits <= ctx.qry.ofs) | 149 | if (hits <= ctx.qry.ofs) |
118 | continue; | 150 | continue; |
119 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) | 151 | if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) |
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); |
130 | html("</td></tr>"); | 163 | html("</td></tr>"); |
131 | last_group = ctx.repo->group; | 164 | last_group = ctx.repo->group; |
132 | } | 165 | } |
133 | htmlf("<tr><td class='%s'>", | 166 | htmlf("<tr><td class='%s'>", |
134 | ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); | 167 | ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); |