X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/a431326e8fab8153905fbde036dd3c9fb4cc8eaa..caed6cb:/ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 0838e18..bd74f42 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -128,7 +128,7 @@ const char *cgit_repobasename(const char *reponame)
/* strip trailing slashes */
while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
/* strip trailing .git */
- if (p >= 3 && !prefixcmp(&rvbuf[p-3], ".git")) {
+ if (p >= 3 && starts_with(&rvbuf[p-3], ".git")) {
p -= 3; rvbuf[p--] = 0;
}
/* strip more trailing slashes if any */
@@ -328,8 +328,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
}
void cgit_commit_link(char *name, const char *title, const char *class,
- const char *head, const char *rev, const char *path,
- int toggle_ssdiff)
+ const char *head, const char *rev, const char *path)
{
if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
name[ctx.cfg.max_msg_len] = '\0';
@@ -347,9 +346,9 @@ void cgit_commit_link(char *name, const char *title, const char *class,
html_url_arg(rev);
delim = "&";
}
- if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+ if (ctx.qry.difftype) {
html(delim);
- html("ss=1");
+ htmlf("dt=%d", ctx.qry.difftype);
delim = "&";
}
if (ctx.qry.context > 0 && ctx.qry.context != 3) {
@@ -386,7 +385,7 @@ void cgit_snapshot_link(const char *name, const char *title, const char *class,
void cgit_diff_link(const char *name, const char *title, const char *class,
const char *head, const char *new_rev, const char *old_rev,
- const char *path, int toggle_ssdiff)
+ const char *path)
{
char *delim;
@@ -403,9 +402,9 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
html_url_arg(old_rev);
delim = "&";
}
- if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+ if (ctx.qry.difftype) {
html(delim);
- html("ss=1");
+ htmlf("dt=%d", ctx.qry.difftype);
delim = "&";
}
if (ctx.qry.context > 0 && ctx.qry.context != 3) {
@@ -436,59 +435,58 @@ void cgit_stats_link(const char *name, const char *title, const char *class,
reporevlink("stats", name, title, class, head, NULL, path);
}
-static void cgit_self_link(char *name, const char *title, const char *class,
- struct cgit_context *ctx)
-{
- if (!strcmp(ctx->qry.page, "repolist"))
- cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
- ctx->qry.ofs);
- else if (!strcmp(ctx->qry.page, "summary"))
- cgit_summary_link(name, title, class, ctx->qry.head);
- else if (!strcmp(ctx->qry.page, "tag"))
- cgit_tag_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
- else if (!strcmp(ctx->qry.page, "tree"))
- cgit_tree_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "plain"))
- cgit_plain_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "log"))
- cgit_log_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path, ctx->qry.ofs,
- ctx->qry.grep, ctx->qry.search,
- ctx->qry.showmsg);
- else if (!strcmp(ctx->qry.page, "commit"))
- cgit_commit_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path, 0);
- else if (!strcmp(ctx->qry.page, "patch"))
- cgit_patch_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "refs"))
- cgit_refs_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "snapshot"))
- cgit_snapshot_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
- else if (!strcmp(ctx->qry.page, "diff"))
- cgit_diff_link(name, title, class, ctx->qry.head,
- ctx->qry.sha1, ctx->qry.sha2,
- ctx->qry.path, 0);
- else if (!strcmp(ctx->qry.page, "stats"))
- cgit_stats_link(name, title, class, ctx->qry.head,
- ctx->qry.path);
+static void cgit_self_link(char *name, const char *title, const char *class)
+{
+ if (!strcmp(ctx.qry.page, "repolist"))
+ cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
+ ctx.qry.ofs);
+ else if (!strcmp(ctx.qry.page, "summary"))
+ cgit_summary_link(name, title, class, ctx.qry.head);
+ else if (!strcmp(ctx.qry.page, "tag"))
+ cgit_tag_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL);
+ else if (!strcmp(ctx.qry.page, "tree"))
+ cgit_tree_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "plain"))
+ cgit_plain_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "log"))
+ cgit_log_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path, ctx.qry.ofs,
+ ctx.qry.grep, ctx.qry.search,
+ ctx.qry.showmsg);
+ else if (!strcmp(ctx.qry.page, "commit"))
+ cgit_commit_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "patch"))
+ cgit_patch_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "refs"))
+ cgit_refs_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "snapshot"))
+ cgit_snapshot_link(name, title, class, ctx.qry.head,
+ ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "diff"))
+ cgit_diff_link(name, title, class, ctx.qry.head,
+ ctx.qry.sha1, ctx.qry.sha2,
+ ctx.qry.path);
+ else if (!strcmp(ctx.qry.page, "stats"))
+ cgit_stats_link(name, title, class, ctx.qry.head,
+ ctx.qry.path);
else {
/* Don't known how to make link for this page */
- repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+ repolink(title, class, ctx.qry.page, ctx.qry.head, ctx.qry.path);
html(">");
html_txt(name);
html("");
@@ -504,7 +502,7 @@ void cgit_object_link(struct object *obj)
shortrev[10] = '\0';
if (obj->type == OBJ_COMMIT) {
cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
- ctx.qry.head, fullrev, NULL, 0);
+ ctx.qry.head, fullrev, NULL);
return;
} else if (obj->type == OBJ_TREE)
page = "tree";
@@ -589,6 +587,23 @@ void cgit_print_date(time_t secs, const char *format, int local_time)
html_txt(buf);
}
+static void print_rel_date(time_t t, double value,
+ const char *class, const char *suffix)
+{
+ char buf[64];
+ struct tm *time;
+
+ if (ctx.cfg.local_time)
+ time = localtime(&t);
+ else
+ time = gmtime(&t);
+ strftime(buf, sizeof(buf) - 1, FMT_LONGDATE, time);
+
+ htmlf("%.0f %s", value, suffix);
+}
+
void cgit_print_age(time_t t, time_t max_relative, const char *format)
{
time_t now, secs;
@@ -597,6 +612,8 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
return;
time(&now);
secs = now - t;
+ if (secs < 0)
+ secs = 0;
if (secs > max_relative && max_relative >= 0) {
cgit_print_date(t, format, ctx.cfg.local_time);
@@ -604,67 +621,70 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
}
if (secs < TM_HOUR * 2) {
- htmlf("%.0f min.",
- secs * 1.0 / TM_MIN);
+ print_rel_date(t, secs * 1.0 / TM_MIN, "age-mins", "min.");
return;
}
if (secs < TM_DAY * 2) {
- htmlf("%.0f hours",
- secs * 1.0 / TM_HOUR);
+ print_rel_date(t, secs * 1.0 / TM_HOUR, "age-hours", "hours");
return;
}
if (secs < TM_WEEK * 2) {
- htmlf("%.0f days",
- secs * 1.0 / TM_DAY);
+ print_rel_date(t, secs * 1.0 / TM_DAY, "age-days", "days");
return;
}
if (secs < TM_MONTH * 2) {
- htmlf("%.0f weeks",
- secs * 1.0 / TM_WEEK);
+ print_rel_date(t, secs * 1.0 / TM_WEEK, "age-weeks", "weeks");
return;
}
if (secs < TM_YEAR * 2) {
- htmlf("%.0f months",
- secs * 1.0 / TM_MONTH);
+ print_rel_date(t, secs * 1.0 / TM_MONTH, "age-months", "months");
return;
}
- htmlf("%.0f years",
- secs * 1.0 / TM_YEAR);
+ print_rel_date(t, secs * 1.0 / TM_YEAR, "age-years", "years");
}
-void cgit_print_http_headers(struct cgit_context *ctx)
+void cgit_print_http_headers(void)
{
- if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
+ if (ctx.env.no_http && !strcmp(ctx.env.no_http, "1"))
return;
- if (ctx->page.status)
- htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
- if (ctx->page.mimetype && ctx->page.charset)
- htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
- ctx->page.charset);
- else if (ctx->page.mimetype)
- htmlf("Content-Type: %s\n", ctx->page.mimetype);
- if (ctx->page.size)
- htmlf("Content-Length: %zd\n", ctx->page.size);
- if (ctx->page.filename)
+ if (ctx.page.status)
+ htmlf("Status: %d %s\n", ctx.page.status, ctx.page.statusmsg);
+ if (ctx.page.mimetype && ctx.page.charset)
+ htmlf("Content-Type: %s; charset=%s\n", ctx.page.mimetype,
+ ctx.page.charset);
+ else if (ctx.page.mimetype)
+ htmlf("Content-Type: %s\n", ctx.page.mimetype);
+ if (ctx.page.size)
+ htmlf("Content-Length: %zd\n", ctx.page.size);
+ if (ctx.page.filename)
htmlf("Content-Disposition: inline; filename=\"%s\"\n",
- ctx->page.filename);
- if (!ctx->env.authenticated)
+ ctx.page.filename);
+ if (!ctx.env.authenticated)
html("Cache-Control: no-cache, no-store\n");
- htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
- htmlf("Expires: %s\n", http_date(ctx->page.expires));
- if (ctx->page.etag)
- htmlf("ETag: \"%s\"\n", ctx->page.etag);
+ htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
+ htmlf("Expires: %s\n", http_date(ctx.page.expires));
+ if (ctx.page.etag)
+ htmlf("ETag: \"%s\"\n", ctx.page.etag);
html("\n");
- if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
+ if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
exit(0);
}
-void cgit_print_docstart(struct cgit_context *ctx)
+static void print_rel_vcs_link(const char *url)
+{
+ html("\n");
+}
+
+void cgit_print_docstart(void)
{
- if (ctx->cfg.embedded) {
- if (ctx->cfg.header)
- html_include(ctx->cfg.header);
+ if (ctx.cfg.embedded) {
+ if (ctx.cfg.header)
+ html_include(ctx.cfg.header);
return;
}
@@ -673,37 +693,39 @@ void cgit_print_docstart(struct cgit_context *ctx)
html("\n");
html("
\n");
html("");
- html_txt(ctx->page.title);
+ html_txt(ctx.page.title);
html("\n");
htmlf("\n", cgit_version);
- if (ctx->cfg.robots && *ctx->cfg.robots)
- htmlf("\n", ctx->cfg.robots);
+ if (ctx.cfg.robots && *ctx.cfg.robots)
+ htmlf("\n", ctx.cfg.robots);
html("\n");
- if (ctx->cfg.favicon) {
+ if (ctx.cfg.favicon) {
html("\n");
}
- if (host && ctx->repo && ctx->qry.head) {
+ if (host && ctx.repo && ctx.qry.head) {
struct strbuf sb = STRBUF_INIT;
- strbuf_addf(&sb, "h=%s", ctx->qry.head);
+ strbuf_addf(&sb, "h=%s", ctx.qry.head);
html("\n");
strbuf_release(&sb);
}
- if (ctx->cfg.head_include)
- html_include(ctx->cfg.head_include);
+ if (ctx.repo)
+ cgit_add_clone_urls(print_rel_vcs_link);
+ if (ctx.cfg.head_include)
+ html_include(ctx.cfg.head_include);
html("\n");
html("\n");
- if (ctx->cfg.header)
- html_include(ctx->cfg.header);
+ if (ctx.cfg.header)
+ html_include(ctx.cfg.header);
}
void cgit_print_docend()
@@ -727,6 +749,43 @@ void cgit_print_docend()
html("\n\n");
}
+static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
+{
+ struct strbuf buf = STRBUF_INIT;
+ char *h = txt, *t, c;
+
+ while (h && *h) {
+ while (h && *h == ' ')
+ h++;
+ if (!*h)
+ break;
+ t = h;
+ while (t && *t && *t != ' ')
+ t++;
+ c = *t;
+ *t = 0;
+
+ if (suffix && *suffix) {
+ strbuf_reset(&buf);
+ strbuf_addf(&buf, "%s/%s", h, suffix);
+ h = buf.buf;
+ }
+ fn(h);
+ *t = c;
+ h = t;
+ }
+
+ strbuf_release(&buf);
+}
+
+void cgit_add_clone_urls(void (*fn)(const char *))
+{
+ if (ctx.repo->clone_url)
+ add_clone_urls(fn, expand_macros(ctx.repo->clone_url), NULL);
+ else if (ctx.cfg.clone_prefix)
+ add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
+}
+
static int print_branch_option(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
@@ -767,47 +826,47 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
}
}
-static const char *hc(struct cgit_context *ctx, const char *page)
+static const char *hc(const char *page)
{
- return strcmp(ctx->qry.page, page) ? NULL : "active";
+ return strcmp(ctx.qry.page, page) ? NULL : "active";
}
-static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
+static void cgit_print_path_crumbs(char *path)
{
- char *old_path = ctx->qry.path;
+ char *old_path = ctx.qry.path;
char *p = path, *q, *end = path + strlen(path);
- ctx->qry.path = NULL;
- cgit_self_link("root", NULL, NULL, ctx);
- ctx->qry.path = p = path;
+ ctx.qry.path = NULL;
+ cgit_self_link("root", NULL, NULL);
+ ctx.qry.path = p = path;
while (p < end) {
if (!(q = strchr(p, '/')))
q = end;
*q = '\0';
html_txt("/");
- cgit_self_link(p, NULL, NULL, ctx);
+ cgit_self_link(p, NULL, NULL);
if (q < end)
*q = '/';
p = q + 1;
}
- ctx->qry.path = old_path;
+ ctx.qry.path = old_path;
}
-static void print_header(struct cgit_context *ctx)
+static void print_header(void)
{
char *logo = NULL, *logo_link = NULL;
html("\n");
}
-void cgit_print_pageheader(struct cgit_context *ctx)
+void cgit_print_pageheader(void)
{
html("");
- if (!ctx->env.authenticated || !ctx->cfg.noheader)
- print_header(ctx);
+ if (!ctx.env.authenticated || !ctx.cfg.noheader)
+ print_header();
html("
| \n");
- if (ctx->env.authenticated && ctx->repo) {
- cgit_summary_link("summary", NULL, hc(ctx, "summary"),
- ctx->qry.head);
- cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
- ctx->qry.sha1, NULL);
- cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
- NULL, ctx->qry.vpath, 0, NULL, NULL,
- ctx->qry.showmsg);
- cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
- ctx->qry.sha1, ctx->qry.vpath);
- cgit_commit_link("commit", NULL, hc(ctx, "commit"),
- ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
- cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
- ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
- if (ctx->repo->max_stats)
- cgit_stats_link("stats", NULL, hc(ctx, "stats"),
- ctx->qry.head, ctx->qry.vpath);
- if (ctx->repo->readme.nr)
+ if (ctx.env.authenticated && ctx.repo) {
+ if (ctx.repo->readme.nr)
reporevlink("about", "about", NULL,
- hc(ctx, "about"), ctx->qry.head, NULL,
+ hc("about"), ctx.qry.head, NULL,
NULL);
+ cgit_summary_link("summary", NULL, hc("summary"),
+ ctx.qry.head);
+ cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
+ ctx.qry.sha1, NULL);
+ cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
+ NULL, ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg);
+ cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
+ ctx.qry.sha1, ctx.qry.vpath);
+ cgit_commit_link("commit", NULL, hc("commit"),
+ ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath);
+ cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
+ ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath);
+ if (ctx.repo->max_stats)
+ cgit_stats_link("stats", NULL, hc("stats"),
+ ctx.qry.head, ctx.qry.vpath);
html(" | ");
html("\n");
- } else if (ctx->env.authenticated) {
- site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, NULL, 0);
- if (ctx->cfg.root_readme)
- site_link("about", "about", NULL, hc(ctx, "about"),
+ } else if (ctx.env.authenticated) {
+ site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0);
+ if (ctx.cfg.root_readme)
+ site_link("about", "about", NULL, hc("about"),
NULL, NULL, 0);
html(" | ");
html("");
}
html(" |
\n");
- if (ctx->env.authenticated && ctx->qry.vpath) {
+ if (ctx.env.authenticated && ctx.qry.vpath) {
html("
");
html("path: ");
- cgit_print_path_crumbs(ctx, ctx->qry.vpath);
+ cgit_print_path_crumbs(ctx.qry.vpath);
html("
");
}
html("
");