ui-snapshot: set unused cgit_filter fields to zero

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index f6120f92c365dec331629075e4ec36f074c1f737..63a5a754ba0297e8775c666495a885d942cf1b0e 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,197 +1,169 @@
 /* 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 items;
-
-static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
+#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 commit *commit;
-       struct commitinfo *info;
-       char buf[256], *url;
-
-       strncpy(buf, refname, sizeof(buf));
-       commit = lookup_commit(sha1);
-       if (commit && !parse_commit(commit)){
-               info = cgit_parse_commit(commit);
-               html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "log",
-                                  fmt("h=%s", refname));
-               html_link_open(url, NULL, NULL);
-               html_txt(buf);
-               html_link_close();
-               html("</td><td>");
-               cgit_print_date(commit->date);
-               html("</td><td>");
-               html_txt(info->author);
-               html("</td><td>");
-               url = cgit_pageurl(cgit_query_repo, "commit",
-                                  fmt("id=%s", sha1_to_hex(sha1)));
-               html_link_open(url, NULL, NULL);
-               html_ntxt(cgit_max_msg_len, info->subject);
-               html_link_close();
-               html("</td></tr>\n");
-               cgit_free_commitinfo(info);
-       } else {
-               html("<tr><td>");
-               html_txt(buf);
-               html("</td><td colspan='3'>");
-               htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
-               html("</td></tr>\n");
+       int columns = 3;
+       struct strbuf basebuf = STRBUF_INIT;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+
+       if (!base || !*base)
+               return;
+       if (suffix && *suffix) {
+               strbuf_addf(&basebuf, "%s/%s", base, suffix);
+               base = basebuf.buf;

        }
        }

-       return 0;
+       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 void cgit_print_object_ref(struct object *obj)
+static void print_urls(char *txt, char *suffix)

 {
 {

-       char *page, *url;
-
-       if (obj->type == OBJ_COMMIT)
-               page = "commit";
-       else if (obj->type == OBJ_TREE)
-               page = "tree";
-       else
-               page = "view";
-
-       url = cgit_pageurl(cgit_query_repo, page,
-                          fmt("id=%s", sha1_to_hex(obj->sha1)));
-       html_link_open(url, NULL, NULL);
-       htmlf("%s %s", typename(obj->type),
-             sha1_to_hex(obj->sha1));
-       html_link_close();
-}
-
-static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
-{
-       struct tag *tag;
-       struct taginfo *info;
-       struct object *obj;
-       char buf[256], *url;
-
-       strncpy(buf, refname, 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 2;
-               if (!items) {
-                       html("<tr class='nohover'><th class='left'>Tag</th>"
-                            "<th class='left'>Created</th>"
-                            "<th class='left'>Author</th>"
-                            "<th class='left'>Reference</th></tr>\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("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+                       htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);

                }
                }

-               items++;
-               html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "view",
-                                  fmt("id=%s", sha1_to_hex(sha1)));
-               html_link_open(url, NULL, NULL);
-               html_txt(buf);
-               html_link_close();
-               html("</td><td>");
-               if (info->tagger_date > 0)
-                       cgit_print_date(info->tagger_date);
-               html("</td><td>");
-               if (info->tagger)
-                       html(info->tagger);
-               html("</td><td>");
-               cgit_print_object_ref(tag->tagged);
-               html("</td></tr>\n");
-       } else {
-               html("<tr><td>");
-               html_txt(buf);
-               html("</td><td colspan='2'/><td>");
-               cgit_print_object_ref(obj);
-               html("</td></tr>\n");
+               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;
-
-       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(sha1, tag->tagged->sha1);
-       } else if (obj->type != OBJ_BLOB) {
-               return 0;
-       }
-       if (!items) {
-               html("<table>");
-               html("<tr><th>Downloads</th></tr>");
+       int columns = 3;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+
+       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);

        }
        }

-       items++;
-       html("<tr><td>");
-       url = cgit_pageurl(cgit_query_repo, "blob",
-                          fmt("id=%s&path=%s", sha1_to_hex(sha1),
-                              buf));
-       html_link_open(url, NULL, NULL);
-       html_txt(buf);
-       html_link_close();
-       html("</td><tr>");
-       return 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>");

 }
 
 }
 

-static void cgit_print_branches()
+/* The caller must free the return value. */
+static char* append_readme_path(const char *filename, const char *ref, const char *path)

 {
 {

-       html("<tr class='nohover'><th class='left'>Branch</th>"
-            "<th class='left'>Updated</th>"
-            "<th class='left'>Author</th>"
-            "<th class='left'>Head commit</th></tr>\n");
-       for_each_branch_ref(cgit_print_branch_cb, NULL);
-}
+       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;
+               }
+       }

 
 

-static void cgit_print_tags()
-{
-       items = 0;
-       for_each_tag_ref(cgit_print_tag_cb, NULL);
-}
+       free(file);
+       free(resolved_base);
+       free(resolved_full);

 
 

-static void cgit_print_archives()
-{
-       items = 0;
-       for_each_ref(cgit_print_archive_cb, NULL);
-       if (items)
-               html("</table>");
+       return full_path;

 }
 
 }
 

-void cgit_print_summary()
+void cgit_print_repo_readme(char *path)

 {
 {

-       html("<table class='list nowrap'>");
-       html("<tr class='nohover'><td id='summary' colspan='3'>");
-       html("<h2>");
-       html_txt(cgit_repo->name);
-       html(" - ");
-       html_txt(cgit_repo->desc);
-       html("</h2>");
-       html("</td><td id='archivelist'>");
-       cgit_print_archives();
-       html("</td></tr>");
-       cgit_print_branches();
-       html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
-       cgit_print_tags();
-       html("</table>");
+       char *filename, *ref;
+       int free_filename = 0;
+
+       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;
+       }
+
+       /* Print the calculated readme, either from the git repo or from the
+        * filesystem, while applying the about-filter.
+        */
+       html("<div id='summary'>");
+       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("</div>");
+       if (free_filename)
+               free(filename);

 }
 }