]> gitweb.ps.run Git - ps-cgit/blobdiff - ui-summary.c
projects / ps-cgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'stable'
[ps-cgit] / ui-summary.c
diff --git a/ui-summary.c b/ui-summary.c
index 3410e1acff9ed4b155865ce3ea7fbc9221af00c1..227ed276d453c951174a815747674f8993f6a337 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,203 +1,124 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@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"
+#include "html.h"
+#include "ui-log.h"
+#include "ui-refs.h"
+#include "ui-blob.h"
 
 
-static int header;
+int urls = 0;
 
 
-static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
+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");
+       if (!base || !*base)
+               return;
+       if (urls++ == 0) {
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               html("<tr><th class='left' colspan='4'>Clone</th></tr>\n");
        }
        }
-       return 0;
-}
-
-
-static void cgit_print_object_ref(struct object *obj)
-{
-       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();
+       if (suffix && *suffix)
+               base = fmt("%s/%s", base, suffix);
+       html("<tr><td colspan='4'><a href='");
+       html_url_path(base);
+       html("'>");
+       html_txt(base);
+       html("</a></td></tr>\n");
 }
 
 }
 
-static void print_tag_header()
+static void print_urls(char *txt, char *suffix)
 {
 {
-       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");
-       header = 1;
-}
-
-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 (!header)
-                       print_tag_header();
-               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 {
-               if (!header)
-                       print_tag_header();
-               html("<tr><td>");
-               html_txt(buf);
-               html("</td><td colspan='2'/><td>");
-               cgit_print_object_ref(obj);
-               html("</td></tr>\n");
+       char *h = txt, *t, c;
+
+       while (h && *h) {
+               while (h && *h == ' ')
+                       h++;
+               t = h;
+               while (t && *t && *t != ' ')
+                       t++;
+               c = *t;
+               *t = 0;
+               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 (!header) {
-               html("<table>");
-               html("<tr><th>Downloads</th></tr>");
-               header = 1;
+       html("<table summary='repository info' class='list nowrap'>");
+       cgit_print_branches(ctx.cfg.summary_branches);
+       html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+       cgit_print_tags(ctx.cfg.summary_tags);
+       if (ctx.cfg.summary_log > 0) {
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+                              NULL, NULL, 0, 0);
        }
        }
-       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()
+void cgit_print_repo_readme(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 *slash, *tmp, *colon, *ref;
 
 
-static void cgit_print_tags()
-{
-       header = 0;
-       for_each_tag_ref(cgit_print_tag_cb, NULL);
-}
+       if (!ctx.repo->readme || !(*ctx.repo->readme))
+               return;
 
 
-static void cgit_print_archives()
-{
-       header = 0;
-       for_each_ref(cgit_print_archive_cb, NULL);
-       if (header)
-               html("</table>");
-}
+       ref = NULL;
 
 
-void cgit_print_summary()
-{
-       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>");
+       /* 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;
+       }
+
+       /* Prepend repo path to relative readme path unless tracked. */
+       if (!ref && *ctx.repo->readme != '/')
+               ctx.repo->readme = xstrdup(fmt("%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("<div id='summary'>");
+       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("</div>");
 }
 }
Unnamed repository; edit this file 'description' to name the repository.