X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/dd0f27eb36e737261b57d6ebcbd9fe20e559470d..81bf4d32b377d3f2fdd7ab3ca651be99408f5c32:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index 016fea2..f965b32 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -1,258 +1,151 @@ /* ui-summary.c: functions for generating repo summary page * * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2010 Jason A. Donenfeld * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" +#include "ui-summary.h" +#include "html.h" +#include "ui-log.h" +#include "ui-refs.h" +#include "ui-blob.h" -static int header; - -static int cmp_age(int age1, int age2) -{ - if (age1 != 0 && age2 != 0) - return age2 - age1; - - if (age1 == 0 && age2 == 0) - return 0; - - if (age1 == 0) - return +1; - - return -1; -} - -static int cmp_ref_name(const void *a, const void *b) -{ - struct refinfo *r1 = *(struct refinfo **)a; - struct refinfo *r2 = *(struct refinfo **)b; - - return strcmp(r1->refname, r2->refname); -} - -static int cmp_branch_age(const void *a, const void *b) -{ - struct refinfo *r1 = *(struct refinfo **)a; - struct refinfo *r2 = *(struct refinfo **)b; - - return cmp_age(r1->commit->committer_date, r2->commit->committer_date); -} - -static int cmp_tag_age(const void *a, const void *b) -{ - struct refinfo *r1 = *(struct refinfo **)a; - struct refinfo *r2 = *(struct refinfo **)b; - - return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date); -} - -static void cgit_print_branch(struct refinfo *ref) +static void print_url(char *base, char *suffix) { - struct commit *commit; - struct commitinfo *info; - char *name = (char *)ref->refname; - - commit = lookup_commit(ref->object->sha1); - // object is not really parsed at this point, because of some fallout - // from previous calls to git functions in cgit_print_log() - commit->object.parsed = 0; - if (commit && !parse_commit(commit)){ - info = cgit_parse_commit(commit); - html(""); - cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0); - html(""); - cgit_print_age(commit->date, -1, NULL); - html(""); - html_txt(info->author); - html(""); - cgit_commit_link(info->subject, NULL, NULL, name, NULL); - html("\n"); - cgit_free_commitinfo(info); - } else { - html(""); - html_txt(name); - html(""); - htmlf("*** bad ref %s ***", sha1_to_hex(ref->object->sha1)); - html("\n"); - } -} + int columns = 3; + struct strbuf basebuf = STRBUF_INIT; -static void print_tag_header() -{ - html("Tag" - "Age" - "Author" - "Reference\n"); - header = 1; -} + if (ctx.repo->enable_log_filecount) + columns++; + if (ctx.repo->enable_log_linecount) + columns++; -static int print_tag(struct refinfo *ref) -{ - struct tag *tag; - struct taginfo *info; - char *url, *name = (char *)ref->refname; - - if (ref->object->type == OBJ_TAG) { - tag = lookup_tag(ref->object->sha1); - if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) - return 2; - html(""); - url = cgit_pageurl(cgit_query_repo, "tag", - fmt("id=%s", name)); - html_link_open(url, NULL, NULL); - html_txt(name); - html_link_close(); - html(""); - if (info->tagger_date > 0) - cgit_print_age(info->tagger_date, -1, NULL); - html(""); - if (info->tagger) - html(info->tagger); - html(""); - cgit_object_link(tag->tagged); - html("\n"); - } else { - if (!header) - print_tag_header(); - html(""); - html_txt(name); - html(""); - cgit_object_link(ref->object); - html("\n"); + if (!base || !*base) + return; + if (suffix && *suffix) { + strbuf_addf(&basebuf, "%s/%s", base, suffix); + base = basebuf.buf; } - return 0; + htmlf(""); + html_txt(base); + html("\n"); + strbuf_release(&basebuf); } -static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, - int flags, void *cb_data) +static void print_urls(char *txt, char *suffix) { - struct tag *tag; - struct taginfo *info; - struct object *obj; - char buf[256], *url; - unsigned char fileid[20]; - - if (prefixcmp(refname, "refs/archives")) - return 0; - strncpy(buf, refname+14, sizeof(buf)); - obj = parse_object(sha1); - if (!obj) - return 1; - if (obj->type == OBJ_TAG) { - tag = lookup_tag(sha1); - if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) - return 0; - hashcpy(fileid, tag->tagged->sha1); - } else if (obj->type != OBJ_BLOB) { - return 0; - } else { - hashcpy(fileid, sha1); - } - if (!header) { - html(""); - html(""); - header = 1; + char *h = txt, *t, c; + int urls = 0; + int columns = 3; + + if (ctx.repo->enable_log_filecount) + columns++; + if (ctx.repo->enable_log_linecount) + columns++; + + + while (h && *h) { + while (h && *h == ' ') + h++; + if (!*h) + break; + t = h; + while (t && *t && *t != ' ') + t++; + c = *t; + *t = 0; + if (urls++ == 0) { + htmlf("", columns); + htmlf("\n", columns); + } + print_url(h, suffix); + *t = c; + h = t; } - html(""); - return 0; -} - -static void print_refs_link(char *path) -{ - html(""); } -void cgit_print_branches(int maxcount) +void cgit_print_summary() { - struct reflist list; - int i; - - html("" - "" - "" - "\n"); - - list.refs = NULL; - list.alloc = list.count = 0; - for_each_branch_ref(cgit_refs_cb, &list); - - if (maxcount == 0 || maxcount > list.count) - maxcount = list.count; - - if (maxcount < list.count) { - qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); - qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); + int columns = 3; + + if (ctx.repo->enable_log_filecount) + columns++; + if (ctx.repo->enable_log_linecount) + columns++; + + html("
Downloads
 
Clone
"); - url = cgit_pageurl(cgit_query_repo, "blob", - fmt("id=%s&path=%s", sha1_to_hex(fileid), - buf)); - html_link_open(url, NULL, NULL); - html_txt(buf); - html_link_close(); - html("
"); - cgit_refs_link("[...]", NULL, NULL, cgit_query_head, NULL, path); - html("
BranchIdleAuthorHead commit
"); + cgit_print_branches(ctx.cfg.summary_branches); + htmlf("", columns); + cgit_print_tags(ctx.cfg.summary_tags); + if (ctx.cfg.summary_log > 0) { + htmlf("", columns); + cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, + NULL, NULL, 0, 0, 0); } - - for(i=0; iclone_url) + print_urls(expand_macros(ctx.repo->clone_url), NULL); + else if (ctx.cfg.clone_prefix) + print_urls(ctx.cfg.clone_prefix, ctx.repo->url); + html("
 
 
"); } -void cgit_print_tags(int maxcount) +void cgit_print_repo_readme(char *path) { - struct reflist list; - int i; + char *slash, *tmp, *colon, *ref; - header = 0; - list.refs = NULL; - list.alloc = list.count = 0; - for_each_tag_ref(cgit_refs_cb, &list); - if (list.count == 0) + if (!ctx.repo->readme || !(*ctx.repo->readme)) return; - qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); - if (!maxcount) - maxcount = list.count; - else if (maxcount > list.count) - maxcount = list.count; - print_tag_header(); - for(i=0; i"); -} + /* Check if the readme is tracked in the git repo. */ + colon = strchr(ctx.repo->readme, ':'); + if (colon && strlen(colon) > 1) { + *colon = '\0'; + ref = ctx.repo->readme; + ctx.repo->readme = colon + 1; + if (!(*ctx.repo->readme)) + return; + } -void cgit_print_summary() -{ + /* Prepend repo path to relative readme path unless tracked. */ + if (!ref && *ctx.repo->readme != '/') + ctx.repo->readme = fmtalloc("%s/%s", ctx.repo->path, + ctx.repo->readme); + + /* If a subpath is specified for the about page, make it relative + * to the directory containing the configured readme. + */ + if (path) { + slash = strrchr(ctx.repo->readme, '/'); + if (!slash) { + if (!colon) + return; + slash = colon; + } + tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); + strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); + strcpy(tmp + (slash - ctx.repo->readme + 1), path); + } else + tmp = ctx.repo->readme; + + /* Print the calculated readme, either from the git repo or from the + * filesystem, while applying the about-filter. + */ html("
"); - cgit_print_archives(); - html("

"); - html_txt(cgit_repo->name); - html(" - "); - html_txt(cgit_repo->desc); - html("

"); - if (cgit_repo->readme) - html_include(cgit_repo->readme); + if (ctx.repo->about_filter) + cgit_open_filter(ctx.repo->about_filter); + if (ref) + cgit_print_file(tmp, ref); + else + html_include(tmp); + if (ctx.repo->about_filter) + cgit_close_filter(ctx.repo->about_filter); html("
"); - if (cgit_summary_log > 0) - cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0); - html(""); - if (cgit_summary_log > 0) - html(""); - cgit_print_branches(cgit_summary_branches); - html(""); - cgit_print_tags(cgit_summary_tags); - html("
 
 
"); }