X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/b1f9b9c1459cb9a30ebf80721aff6ef788d1f891..dc41a0018058c81ee9a0a2dc6e89f737d7c1c966:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index 0afa0a3..b0af073 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -1,201 +1,132 @@ /* ui-summary.c: functions for generating repo summary page * - * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2006-2014 cgit Development Team * * 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" +#include "ui-shared.h" +#include -static int header; +static int urls; -static int cmp_age(int age1, int age2) +static void print_url(const char *url) { - if (age1 != 0 && age2 != 0) - return age2 - age1; + int columns = 3; - if (age1 == 0 && age2 == 0) - return 0; + if (ctx.repo->enable_log_filecount) + columns++; + if (ctx.repo->enable_log_linecount) + columns++; - 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; + if (urls++ == 0) { + htmlf(" ", columns); + htmlf("Clone\n", columns); + } - return cmp_age(r1->commit->committer_date, r2->commit->committer_date); + htmlf(""); + html_txt(url); + html("\n"); } -static int cmp_tag_age(const void *a, const void *b) +void cgit_print_summary(void) { - struct refinfo *r1 = *(struct refinfo **)a; - struct refinfo *r2 = *(struct refinfo **)b; + int columns = 3; - 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, NULL, NULL); - 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); + html(""); + 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("\n"); - return 0; -} - -static void print_tag_header() -{ - html("" - "" - "" - "\n"); - header = 1; + urls = 0; + cgit_add_clone_urls(print_url); + html("
 
 
TagAgeAuthorReference
"); } -static int print_tag(struct refinfo *ref) +/* The caller must free the return value. */ +static char* append_readme_path(const char *filename, const char *ref, const char *path) { - 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(ctx.qry.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 *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 || !starts_with(resolved_full, resolved_base)) { + free(full_path); + full_path = NULL; + } } - return 0; -} -static void print_refs_link(char *path) -{ - html(""); - cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); - html(""); + free(file); + free(resolved_base); + free(resolved_full); + + return full_path; } -void cgit_print_branches(int maxcount) +void cgit_print_repo_readme(char *path) { - struct reflist list; - int i; + char *filename, *ref; + int free_filename = 0; - html("Branch" - "Idle" - "Author" - "Head commit\n"); - - list.refs = NULL; - list.alloc = list.count = 0; - for_each_branch_ref(cgit_refs_cb, &list); + if (ctx.repo->readme.nr == 0) + return; - if (maxcount == 0 || maxcount > list.count) - maxcount = list.count; + filename = ctx.repo->readme.items[0].string; + ref = ctx.repo->readme.items[0].util; - 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); + if (path) { + free_filename = 1; + filename = append_readme_path(filename, ref, path); + if (!filename) + return; } - for(i=0; i list.count) - maxcount = list.count; - print_tag_header(); - for(i=0; ireadme) { - html("
"); - html_include(ctx.repo->readme); - html("
"); - } - if (ctx.cfg.summary_log > 0) - cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, - NULL, NULL, 0); - html(""); - if (ctx.cfg.summary_log > 0) - html(""); - cgit_print_branches(ctx.cfg.summary_branches); - html(""); - cgit_print_tags(ctx.cfg.summary_tags); - html("
 
 
"); + /* Print the calculated readme, either from the git repo or from the + * filesystem, while applying the about-filter. + */ + html("
"); + cgit_open_filter(ctx.repo->about_filter, filename); + if (ref) + cgit_print_file(filename, ref, 1); + else + html_include(filename); + cgit_close_filter(ctx.repo->about_filter); + + html("
"); + if (free_filename) + free(filename); }