X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/cbcdbcf2bff23113fe81df8f11fe7843b8ed637e..7fb12a8ee0789e3eab2680ae6c3fde0f0f233d22:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index ba90510..5598d08 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -1,253 +1,170 @@ /* ui-summary.c: functions for generating repo summary page * * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2010-2013 Jason A. Donenfeld * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.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) +#include "ui-summary.h" +#include "html.h" +#include "ui-log.h" +#include "ui-refs.h" +#include "ui-blob.h" +#include + +static void print_url(char *base, char *suffix) { - struct refinfo *r1 = *(struct refinfo **)a; - struct refinfo *r2 = *(struct refinfo **)b; + int columns = 3; + struct strbuf basebuf = STRBUF_INIT; - return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date); -} + if (ctx.repo->enable_log_filecount) + columns++; + if (ctx.repo->enable_log_linecount) + columns++; -static int print_branch(struct refinfo *ref) -{ - struct commitinfo *info = ref->commit; - char *name = (char *)ref->refname; - - if (!info) - return 1; - html(""); - cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0); - html(""); - - if (ref->object->type == OBJ_COMMIT) { - cgit_print_age(info->commit->date, -1, NULL); - html(""); - html_txt(info->author); - html(""); - cgit_commit_link(info->subject, NULL, NULL, name, NULL); - } else { - html(""); - cgit_object_link(ref->object); + if (!base || !*base) + return; + if (suffix && *suffix) { + strbuf_addf(&basebuf, "%s/%s", base, suffix); + base = basebuf.buf; } - html("\n"); - return 0; -} - -static void print_tag_header() -{ - html("Tag" - "Age" - "Author" - "Reference\n"); - header = 1; + htmlf(""); + html_txt(base); + html("\n"); + strbuf_release(&basebuf); } -static int print_tag(struct refinfo *ref) +static void print_urls(char *txt, char *suffix) { - struct tag *tag; - struct taginfo *info; - char *url, *name = (char *)ref->refname; - - if (ref->object->type == OBJ_TAG) { - tag = (struct tag *)ref->object; - info = ref->tag; - if (!tag || !info) - return 1; - 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"); + 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("Clone\n", columns); + } + print_url(h, suffix); + *t = c; + h = t; } - return 0; } -static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, - int flags, void *cb_data) +void cgit_print_summary() { - 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; + int columns = 3; + + if (ctx.repo->enable_log_filecount) + columns++; + if (ctx.repo->enable_log_linecount) + columns++; + + html("
Downloads
"); + 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); } - html(""); - return 0; -} - -static void print_refs_link(char *path) -{ - html(""); + if (ctx.repo->clone_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("
 
 
"); - 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("
"); } -void cgit_print_branches(int maxcount) +/* The caller must free the return value. */ +static char* append_readme_path(const char *filename, const char *ref, const char *path) { - struct reflist list; - int i; - - html("Branch" - "Idle" - "Author" - "Head commit\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); + char *file, *base_dir, *full_path, *resolved_base = NULL, *resolved_full = NULL; + /* If a subpath is specified for the about page, make it relative + * to the directory containing the configured readme. */ + + file = xstrdup(filename); + base_dir = dirname(file); + if (!strcmp(base_dir, ".") || !strcmp(base_dir, "..")) { + if (!ref) { + free(file); + return NULL; + } + full_path = xstrdup(path); + } else + full_path = fmtalloc("%s/%s", base_dir, path); + + if (!ref) { + resolved_base = realpath(base_dir, NULL); + resolved_full = realpath(full_path, NULL); + if (!resolved_base || !resolved_full || strncmp(resolved_base, resolved_full, strlen(resolved_base))) { + free(full_path); + full_path = NULL; + } } - for(i=0; i list.count) - maxcount = list.count; - print_tag_header(); - for(i=0; i"); -} + if (ctx.repo->readme.nr == 0) + return; + + filename = ctx.repo->readme.items[0].string; + ref = ctx.repo->readme.items[0].util; + + if (path) { + free_filename = 1; + filename = append_readme_path(filename, ref, path); + if (!filename) + return; + } -void cgit_print_summary() -{ + /* 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) { + ctx.repo->about_filter->argv[1] = filename; + cgit_open_filter(ctx.repo->about_filter); + } + if (ref) + cgit_print_file(filename, ref, 1); + else + html_include(filename); + if (ctx.repo->about_filter) { + cgit_close_filter(ctx.repo->about_filter); + ctx.repo->about_filter->argv[1] = NULL; + } html("
"); - if (cgit_summary_log > 0) - cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, NULL, 0); - html(""); - if (cgit_summary_log > 0) - html(""); - cgit_print_branches(cgit_summary_branches); - html(""); - cgit_print_tags(cgit_summary_tags); - html("
 
 
"); + if (free_filename) + free(filename); }