shorten snapshot names to repo basename

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 383b8acb353124c85ec2f920971df469013c5a08..3e378a48246d944f771fd05b31bd1209b58eb5d7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -57,13 +57,13 @@ char *cgit_repourl(const char *reponame)
        }
 }
 
-char *cgit_pageurl(const char *reponame, const char *pagename,
-                  const char *query)
+char *cgit_fileurl(const char *reponame, const char *pagename,
+                  const char *filename, const char *query)
 {
        if (cgit_virtual_root) {
                if (query)
-                       return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
-                                  pagename, query);
+                       return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
+                                  pagename, filename?filename:"", query);
                else
                        return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
                                   pagename);
@@ -75,6 +75,37 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
        }
 }
 
+char *cgit_pageurl(const char *reponame, const char *pagename,
+                  const char *query)
+{
+       return cgit_fileurl(reponame,pagename,0,query);
+}
+
+const char *cgit_repobasename(const char *reponame)
+{
+       /* I assume we don't need to store more than one repo basename */
+       static char rvbuf[1024];
+       int p;
+       const char *rv;
+       strncpy(rvbuf,reponame,sizeof(rvbuf));
+       if(rvbuf[sizeof(rvbuf)-1])
+               die("cgit_repobasename: truncated repository name '%s'", reponame);
+       p = strlen(rvbuf)-1;
+       /* strip trailing slashes */
+       while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+       /* strip trailing .git */
+       if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+               p -= 3; rvbuf[p--] = 0;
+       }
+       /* strip more trailing slashes if any */
+       while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+       /* find last slash in the remaining string */
+       rv = strrchr(rvbuf,'/');
+       if(rv)
+               return ++rv;
+       return rvbuf;
+}
+
 char *cgit_currurl()
 {
        if (!cgit_virtual_root)
@@ -163,9 +194,25 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-                  char *rev, char *path)
+                  char *rev, char *path, int ofs)
 {
-       reporevlink("log", name, title, class, head, rev, path);
+       char *delim;
+
+       delim = repolink(title, class, "log", head, path);
+       if (rev && strcmp(rev, cgit_query_head)) {
+               html(delim);
+               html("id=");
+               html_attr(rev);
+               delim = "&";
+       }
+       if (ofs > 0) {
+               html(delim);
+               html("ofs=");
+               htmlf("%d", ofs);
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
@@ -266,7 +313,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
        html("<title>");
        html_txt(title);
        html("</title>\n");
-       htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
+       htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(cgit_css);
        html("'/>\n");
@@ -302,10 +349,10 @@ void cgit_print_pageheader(char *title, int show_search)
                            NULL, NULL);
                html(" ");
                cgit_log_link("log", NULL, NULL, cgit_query_head,
-                             cgit_query_sha1, cgit_query_path);
+                             cgit_query_sha1, cgit_query_path, 0);
                html(" ");
-               cgit_tree_link("files", NULL, NULL, cgit_query_head,
-                              cgit_query_sha1, cgit_query_path);
+               cgit_tree_link("tree", NULL, NULL, cgit_query_head,
+                              cgit_query_sha1, NULL);
                html(" ");
                cgit_commit_link("commit", NULL, NULL, cgit_query_head,
                              cgit_query_sha1);
@@ -352,3 +399,5 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                                         ttl_seconds(item->ttl)));
        html("\n");
 }
+
+/* vim:set sw=8: */