Move functions for generic object output into ui-view.c

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 300fe46505c7d09897e42996971d9f3bf830c3b8..52d9bd3acd505cd3e739b1c590813b11b1d050ac 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -84,143 +84,6 @@ void cgit_querystring_cb(const char *name, const char *value)
        }
 }
 
-static int get_one_line(char *txt)
-{
-       char *t;
-
-       for(t=txt; *t != '\n' && t != '\0'; t++)
-               ;
-       *t = '\0';
-       return t-txt-1;
-}
-
-static void cgit_print_commit_shortlog(struct commit *commit)
-{
-       char *h, *t, *p; 
-       char *tree = NULL, *author = NULL, *subject = NULL;
-       int len;
-       time_t sec;
-       struct tm *time;
-       char buf[32];
-
-       h = t = commit->buffer;
-       
-       if (strncmp(h, "tree ", 5))
-               die("Bad commit format: %s", 
-                   sha1_to_hex(commit->object.sha1));
-       
-       len = get_one_line(h);
-       tree = h+5;
-       h += len + 2;
-
-       while (!strncmp(h, "parent ", 7))
-               h += get_one_line(h) + 2;
-       
-       if (!strncmp(h, "author ", 7)) {
-               author = h+7;
-               h += get_one_line(h) + 2;
-               t = author;
-               while(t!=h && *t!='<') 
-                       t++;
-               *t='\0';
-               p = t;
-               while(--t!=author && *t==' ')
-                       *t='\0';
-               while(++p!=h && *p!='>')
-                       ;
-               while(++p!=h && !isdigit(*p))
-                       ;
-
-               t = p;
-               while(++p && isdigit(*p))
-                       ;
-               *p = '\0';
-               sec = atoi(t);
-               time = gmtime(&sec);
-       }
-
-       while((len = get_one_line(h)) > 0)
-               h += len+2;
-
-       h++;
-       len = get_one_line(h);
-
-       subject = h;
-
-       html("<tr><td>");
-       strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
-       html_txt(buf);
-       html("</td><td>");
-       char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-       char *url = cgit_pageurl(cgit_query_repo, "view", qry);
-       html_link_open(url, NULL, NULL);
-       html_txt(subject);
-       html_link_close();
-       html("</td><td>");
-       html_txt(author);
-       html("</td></tr>\n");
-}
-
-static void cgit_print_log(const char *tip, int ofs, int cnt)
-{
-       struct rev_info rev;
-       struct commit *commit;
-       const char *argv[2] = {NULL, tip};
-       int n = 0;
-       
-       init_revisions(&rev, NULL);
-       rev.abbrev = DEFAULT_ABBREV;
-       rev.commit_format = CMIT_FMT_DEFAULT;
-       rev.verbose_header = 1;
-       rev.show_root_diff = 0;
-       setup_revisions(2, argv, &rev, NULL);
-       prepare_revision_walk(&rev);
-
-       html("<h2>Log</h2>");
-       html("<table class='list'>");
-       html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n");
-       while ((commit = get_revision(&rev)) != NULL && n++ < 100) {
-               cgit_print_commit_shortlog(commit);
-               free(commit->buffer);
-               commit->buffer = NULL;
-               free_commit_list(commit->parents);
-               commit->parents = NULL;
-       }
-       html("</table>\n");
-}
-
-static void cgit_print_object(char *hex)
-{
-       unsigned char sha1[20];
-       //struct object *object;
-       char type[20];
-       unsigned char *buf;
-       unsigned long size;
-
-       if (get_sha1_hex(hex, sha1)){
-               cgit_print_error(fmt("Bad hex value: %s", hex));
-               return;
-       }
-
-       if (sha1_object_info(sha1, type, NULL)){
-               cgit_print_error("Bad object name");
-               return;
-       }
-
-       buf = read_sha1_file(sha1, type, &size);
-       if (!buf) {
-               cgit_print_error("Error reading object");
-               return;
-       }
-
-       buf[size] = '\0';
-       html("<h2>Object view</h2>");
-       htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size);
-       html("<pre>");
-       html_txt(buf);
-       html("</pre>");
-}
-
 static void cgit_print_repo_page(struct cacheitem *item)
 {
        if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
@@ -238,11 +101,11 @@ static void cgit_print_repo_page(struct cacheitem *item)
        cgit_print_docstart(title, item);
        cgit_print_pageheader(title);
        if (!cgit_query_page)
-               cgit_print_repo_summary();
+               cgit_print_summary();
        else if (!strcmp(cgit_query_page, "log")) {
                cgit_print_log(cgit_query_head, 0, 100);
        } else if (!strcmp(cgit_query_page, "view")) {
-               cgit_print_object(cgit_query_sha1);
+               cgit_print_view(cgit_query_sha1);
        }
        cgit_print_docend();
 }