]> git.cameronkatri.com Git - cgit.git/blobdiff - ui-summary.c
git.ckatri.com / cgit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
parsing.c: Remove leading space from committer
[cgit.git] / ui-summary.c
diff --git a/ui-summary.c b/ui-summary.c
index b96414e18a826009c782794beca8897186fd07e5..ddd8f1b3392a329013cb7ee7d8c652e2847f4d22 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,200 +1,164 @@
 /* ui-summary.c: functions for generating repo summary page
  *
 /* ui-summary.c: functions for generating repo summary page
  *
- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
  *
  * 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)
+#include "ui-summary.h"
+#include "html.h"
+#include "ui-log.h"
+#include "ui-refs.h"
+#include "ui-blob.h"
+#include <libgen.h>
+
+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 strcmp(r1->refname, r2->refname);
-}
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
 
 
-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);
+       if (!base || !*base)
+               return;
+       if (suffix && *suffix) {
+               strbuf_addf(&basebuf, "%s/%s", base, suffix);
+               base = basebuf.buf;
+       }
+       htmlf("<tr><td colspan='%d'><a href='", columns);
+       html_url_path(base);
+       html("'>");
+       html_txt(base);
+       html("</a></td></tr>\n");
+       strbuf_release(&basebuf);
 }
 
 }
 
-static int print_branch(struct refinfo *ref)
+static void print_urls(char *txt, char *suffix)
 {
 {
-       struct commitinfo *info = ref->commit;
-       char *name = (char *)ref->refname;
-
-       if (!info)
-               return 1;
-       html("<tr><td>");
-       cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
-       html("</td><td>");
-
-       if (ref->object->type == OBJ_COMMIT) {
-               cgit_print_age(info->commit->date, -1, NULL);
-               html("</td><td>");
-               html_txt(info->author);
-               html("</td><td>");
-               cgit_commit_link(info->subject, NULL, NULL, name, NULL);
-       } else {
-               html("</td><td></td><td>");
-               cgit_object_link(ref->object);
+       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("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+                       htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
+               }
+               print_url(h, suffix);
+               *t = c;
+               h = t;
        }
        }
-       html("</td></tr>\n");
-       return 0;
 }
 
 }
 
-static void print_tag_header()
+void cgit_print_summary()
 {
 {
-       html("<tr class='nohover'><th class='left'>Tag</th>"
-            "<th class='left'>Age</th>"
-            "<th class='left'>Author</th>"
-            "<th class='left'>Reference</th></tr>\n");
-       header = 1;
-}
+       int columns = 3;
 
 
-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 = (struct tag *)ref->object;
-               info = ref->tag;
-               if (!tag || !info)
-                       return 1;
-               html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "tag",
-                                  fmt("id=%s", name));
-               html_link_open(url, NULL, NULL);
-               html_txt(name);
-               html_link_close();
-               html("</td><td>");
-               if (info->tagger_date > 0)
-                       cgit_print_age(info->tagger_date, -1, NULL);
-               html("</td><td>");
-               if (info->tagger)
-                       html(info->tagger);
-               html("</td><td>");
-               cgit_object_link(tag->tagged);
-               html("</td></tr>\n");
-       } else {
-               if (!header)
-                       print_tag_header();
-               html("<tr><td>");
-               html_txt(name);
-               html("</td><td colspan='2'/><td>");
-               cgit_object_link(ref->object);
-               html("</td></tr>\n");
-       }
-       return 0;
-}
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
 
 
-static void print_refs_link(char *path)
-{
-       html("<tr class='nohover'><td colspan='4'>");
-       cgit_refs_link("[...]", NULL, NULL, cgit_query_head, NULL, path);
-       html("</td></tr>");
+       html("<table summary='repository info' class='list nowrap'>");
+       cgit_print_branches(ctx.cfg.summary_branches);
+       htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+       cgit_print_tags(ctx.cfg.summary_tags);
+       if (ctx.cfg.summary_log > 0) {
+               htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+                              NULL, NULL, 0, 0, 0);
+       }
+       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("</table>");
 }
 
 }
 
-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("<tr class='nohover'><th class='left'>Branch</th>"
-            "<th class='left'>Idle</th>"
-            "<th class='left'>Author</th>"
-            "<th class='left'>Head commit</th></tr>\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 || prefixcmp(resolved_full, resolved_base)) {
+                       free(full_path);
+                       full_path = NULL;
+               }
        }
 
        }
 
-       for(i=0; i<maxcount; i++)
-               print_branch(list.refs[i]);
+       free(file);
+       free(resolved_base);
+       free(resolved_full);
 
 
-       if (maxcount < list.count)
-               print_refs_link("heads");
+       return full_path;
 }
 
 }
 
-void cgit_print_tags(int maxcount)
+void cgit_print_repo_readme(char *path)
 {
 {
-       struct reflist list;
-       int i;
-
-       header = 0;
-       list.refs = NULL;
-       list.alloc = list.count = 0;
-       for_each_tag_ref(cgit_refs_cb, &list);
-       if (list.count == 0)
-               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<maxcount; i++)
-               print_tag(list.refs[i]);
-
-       if (maxcount < list.count)
-               print_refs_link("tags");
-}
+       char *filename, *ref;
+       int free_filename = 0;
 
 
-void cgit_print_summary()
-{
-       if (cgit_repo->readme) {
-               html("<div id='summary'>");
-               html_include(cgit_repo->readme);
-               html("</div>");
+       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;
        }
        }
-       if (cgit_summary_log > 0)
-               cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL,
-                              NULL, NULL, 0);
-       html("<table summary='repository info' class='list nowrap'>");
-       if (cgit_summary_log > 0)
-               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
-       cgit_print_branches(cgit_summary_branches);
-       html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
-       cgit_print_tags(cgit_summary_tags);
-       html("</table>");
+
+       /* Print the calculated readme, either from the git repo or from the
+        * filesystem, while applying the about-filter.
+        */
+       html("<div id='summary'>");
+       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("</div>");
+       if (free_filename)
+               free(filename);
 }
 }
A hyperfast web frontend for git repositories written in C.