katolaz
/
cgit-70
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add struct cgit_page to cgit_context

Browse Source 
This struct is used when generating http headers, and as such is another
small step towards the goal of the whole cleanup series; to invoke each
page/view function with a function pointer.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
upstream
Lars Hjemli 17 years ago
parent b1f9b9c145
commit f3c1a187fe
8 changed files with 113 additions and 88 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 50
      cgit.c
  2. 18
      cgit.h
  3. 3
      shared.c
  4. 4
      ui-blob.c
  5. 4
      ui-patch.c
  6. 6
      ui-repolist.c
  7. 112
      ui-shared.c
  8. 4
      ui-snapshot.c

50
cgit.c
Unescape View File

@ -7,13 +7,16 @@
*/ */
#include "cgit.h" #include "cgit.h"
#include "cmd.h"
static int cgit_prepare_cache(struct cacheitem *item) static int cgit_prepare_cache(struct cacheitem *item)
{ {
if (!ctx.repo && ctx.qry.repo) { if (!ctx.repo && ctx.qry.repo) {
char *title = fmt("%s - %s", ctx.cfg.root_title, "Bad request"); ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
cgit_print_docstart(title, item); "Bad request");
cgit_print_pageheader(title, 0); cgit_print_http_headers(&ctx);
cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo)); cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
cgit_print_docend(); cgit_print_docend();
return 0; return 0;
@ -80,7 +83,7 @@ char *find_default_branch(struct cgit_repo *repo)
static void cgit_print_repo_page(struct cacheitem *item) static void cgit_print_repo_page(struct cacheitem *item)
{ {
char *title, *tmp; char *tmp;
int show_search; int show_search;
unsigned char sha1[20]; unsigned char sha1[20];
int nongit = 0; int nongit = 0;
@ -88,17 +91,19 @@ static void cgit_print_repo_page(struct cacheitem *item)
setenv("GIT_DIR", ctx.repo->path, 1); setenv("GIT_DIR", ctx.repo->path, 1);
setup_git_directory_gently(&nongit); setup_git_directory_gently(&nongit);
if (nongit) { if (nongit) {
title = fmt("%s - %s", ctx.cfg.root_title, "config error"); ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
"config error");
tmp = fmt("Not a git repository: '%s'", ctx.repo->path); tmp = fmt("Not a git repository: '%s'", ctx.repo->path);
ctx.repo = NULL; ctx.repo = NULL;
cgit_print_docstart(title, item); cgit_print_http_headers(&ctx);
cgit_print_pageheader(title, 0); cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
cgit_print_error(tmp); cgit_print_error(tmp);
cgit_print_docend(); cgit_print_docend();
return; return;
} }
title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc); ctx.page.title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc);
show_search = 0; show_search = 0;
if (!ctx.qry.head) { if (!ctx.qry.head) {
@ -107,8 +112,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
} }
if (!ctx.qry.head) { if (!ctx.qry.head) {
cgit_print_docstart(title, item); cgit_print_http_headers(&ctx);
cgit_print_pageheader(title, 0); cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
cgit_print_error("Repository seems to be empty"); cgit_print_error("Repository seems to be empty");
cgit_print_docend(); cgit_print_docend();
return; return;
@ -117,8 +123,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
if (get_sha1(ctx.qry.head, sha1)) { if (get_sha1(ctx.qry.head, sha1)) {
tmp = xstrdup(ctx.qry.head); tmp = xstrdup(ctx.qry.head);
ctx.qry.head = ctx.repo->defbranch; ctx.qry.head = ctx.repo->defbranch;
cgit_print_docstart(title, item); cgit_print_http_headers(&ctx);
cgit_print_pageheader(title, 0); cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
cgit_print_error(fmt("Invalid branch: %s", tmp)); cgit_print_error(fmt("Invalid branch: %s", tmp));
cgit_print_docend(); cgit_print_docend();
return; return;
@ -143,15 +150,16 @@ static void cgit_print_repo_page(struct cacheitem *item)
} }
show_search = (cgit_cmd == CMD_LOG); show_search = (cgit_cmd == CMD_LOG);
cgit_print_docstart(title, item); cgit_print_http_headers(&ctx);
cgit_print_docstart(&ctx);
if (!cgit_cmd) { if (!cgit_cmd) {
cgit_print_pageheader("summary", show_search); cgit_print_pageheader(&ctx);
cgit_print_summary(); cgit_print_summary();
cgit_print_docend(); cgit_print_docend();
return; return;
} }
cgit_print_pageheader(ctx.qry.page, show_search); cgit_print_pageheader(&ctx);
switch(cgit_cmd) { switch(cgit_cmd) {
case CMD_LOG: case CMD_LOG:
@ -180,12 +188,18 @@ static void cgit_print_repo_page(struct cacheitem *item)
cgit_print_docend(); cgit_print_docend();
} }
static long ttl_seconds(long ttl)
{
if (ttl<0)
return 60 * 60 * 24 * 365;
else
return ttl * 60;
}
static void cgit_fill_cache(struct cacheitem *item, int use_cache) static void cgit_fill_cache(struct cacheitem *item, int use_cache)
{ {
int stdout2; int stdout2;
item->st.st_mtime = time(NULL);
if (use_cache) { if (use_cache) {
stdout2 = chk_positive(dup(STDOUT_FILENO), stdout2 = chk_positive(dup(STDOUT_FILENO),
"Preserving STDOUT"); "Preserving STDOUT");
@ -193,6 +207,8 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
} }
ctx.page.modified = time(NULL);
ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl);
if (ctx.repo) if (ctx.repo)
cgit_print_repo_page(item); cgit_print_repo_page(item);
else else

18
cgit.h
Unescape View File

@ -174,10 +174,20 @@ struct cgit_config {
int summary_tags; int summary_tags;
}; };
struct cgit_page {
time_t modified;
time_t expires;
char *mimetype;
char *charset;
char *filename;
char *title;
};
struct cgit_context { struct cgit_context {
struct cgit_query qry; struct cgit_query qry;
struct cgit_config cfg; struct cgit_config cfg;
struct cgit_repo *repo; struct cgit_repo *repo;
struct cgit_page page;
}; };
extern const char *cgit_version; extern const char *cgit_version;
@ -260,12 +270,10 @@ extern void cgit_object_link(struct object *obj);
extern void cgit_print_error(char *msg); extern void cgit_print_error(char *msg);
extern void cgit_print_date(time_t secs, char *format); extern void cgit_print_date(time_t secs, char *format);
extern void cgit_print_age(time_t t, time_t max_relative, char *format); extern void cgit_print_age(time_t t, time_t max_relative, char *format);
extern void cgit_print_docstart(char *title, struct cacheitem *item); extern void cgit_print_http_headers(struct cgit_context *ctx);
extern void cgit_print_docstart(struct cgit_context *ctx);
extern void cgit_print_docend(); extern void cgit_print_docend();
extern void cgit_print_pageheader(char *title, int show_search); extern void cgit_print_pageheader(struct cgit_context *ctx);
extern void cgit_print_snapshot_start(const char *mimetype,
const char *filename,
struct cacheitem *item);
extern void cgit_print_filemode(unsigned short mode); extern void cgit_print_filemode(unsigned short mode);
extern void cgit_print_branches(int maxcount); extern void cgit_print_branches(int maxcount);
extern void cgit_print_tags(int maxcount); extern void cgit_print_tags(int maxcount);

3
shared.c
Unescape View File

@ -35,6 +35,9 @@ void cgit_prepare_context(struct cgit_context *ctx)
ctx->cfg.robots = "index, nofollow"; ctx->cfg.robots = "index, nofollow";
ctx->cfg.root_title = "Git repository browser"; ctx->cfg.root_title = "Git repository browser";
ctx->cfg.script_name = CGIT_SCRIPT_NAME; ctx->cfg.script_name = CGIT_SCRIPT_NAME;
ctx->page.mimetype = "text/html";
ctx->page.charset = PAGE_ENCODING;
ctx->page.filename = NULL;
} }
int cgit_get_cmd_index(const char *cmd) int cgit_get_cmd_index(const char *cmd)

4
ui-blob.c
Unescape View File

@ -35,6 +35,8 @@ void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
} }
buf[size] = '\0'; buf[size] = '\0';
cgit_print_snapshot_start("text/plain", path, item); ctx.page.mimetype = "text/plain";
ctx.page.filename = path;
cgit_print_http_headers(&ctx);
write(htmlfd, buf, size); write(htmlfd, buf, size);
} }

4
ui-patch.c
Unescape View File

@ -92,7 +92,9 @@ void cgit_print_patch(char *hex, struct cacheitem *item)
hashcpy(old_sha1, commit->parents->item->object.sha1); hashcpy(old_sha1, commit->parents->item->object.sha1);
patchname = fmt("%s.patch", sha1_to_hex(sha1)); patchname = fmt("%s.patch", sha1_to_hex(sha1));
cgit_print_snapshot_start("text/plain", patchname, item); ctx.page.mimetype = "text/plain";
ctx.page.filename = patchname;
cgit_print_http_headers(&ctx);
htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
htmlf("From: %s%s\n", info->author, info->author_email); htmlf("From: %s%s\n", info->author, info->author_email);
html("Date: "); html("Date: ");

6
ui-repolist.c
Unescape View File

@ -51,8 +51,10 @@ void cgit_print_repolist(struct cacheitem *item)
if (ctx.cfg.enable_index_links) if (ctx.cfg.enable_index_links)
columns++; columns++;
cgit_print_docstart(ctx.cfg.root_title, item); ctx.page.title = ctx.cfg.root_title;
cgit_print_pageheader(ctx.cfg.root_title, 0); cgit_print_http_headers(&ctx);
cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
html("<table summary='repository list' class='list nowrap'>"); html("<table summary='repository list' class='list nowrap'>");
if (ctx.cfg.index_header) { if (ctx.cfg.index_header) {

112
ui-shared.c
Unescape View File

@ -26,14 +26,6 @@ static char *http_date(time_t t)
tm->tm_hour, tm->tm_min, tm->tm_sec); tm->tm_hour, tm->tm_min, tm->tm_sec);
} }
static long ttl_seconds(long ttl)
{
if (ttl<0)
return 60 * 60 * 24 * 365;
else
return ttl * 60;
}
void cgit_print_error(char *msg) void cgit_print_error(char *msg)
{ {
html("<div class='error'>"); html("<div class='error'>");
@ -361,24 +353,34 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
secs * 1.0 / TM_YEAR); secs * 1.0 / TM_YEAR);
} }
void cgit_print_docstart(char *title, struct cacheitem *item) void cgit_print_http_headers(struct cgit_context *ctx)
{ {
html("Content-Type: text/html; charset=" PAGE_ENCODING "\n"); if (ctx->page.mimetype && ctx->page.charset)
htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
htmlf("Expires: %s\n", http_date(item->st.st_mtime + ctx->page.charset);
ttl_seconds(item->ttl))); else if (ctx->page.mimetype)
htmlf("Content-Type: %s\n", ctx->page.mimetype);
if (ctx->page.filename)
htmlf("Content-Disposition: inline; filename=\"%s\"\n",
ctx->page.filename);
htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
htmlf("Expires: %s\n", http_date(ctx->page.expires));
html("\n"); html("\n");
}
void cgit_print_docstart(struct cgit_context *ctx)
{
html(cgit_doctype); html(cgit_doctype);
html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
html("<head>\n"); html("<head>\n");
html("<title>"); html("<title>");
html_txt(title); html_txt(ctx->page.title);
html("</title>\n"); html("</title>\n");
htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
if (ctx.cfg.robots && *ctx.cfg.robots) if (ctx->cfg.robots && *ctx->cfg.robots)
htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots); htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
html("<link rel='stylesheet' type='text/css' href='"); html("<link rel='stylesheet' type='text/css' href='");
html_attr(ctx.cfg.css); html_attr(ctx->cfg.css);
html("'/>\n"); html("'/>\n");
html("</head>\n"); html("</head>\n");
html("<body>\n"); html("<body>\n");
@ -463,7 +465,7 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
} }
} }
void cgit_print_pageheader(char *title, int show_search) void cgit_print_pageheader(struct cgit_context *ctx)
{ {
static const char *default_info = "This is cgit, a fast webinterface for git repositories"; static const char *default_info = "This is cgit, a fast webinterface for git repositories";
int header = 0; int header = 0;
@ -475,40 +477,40 @@ void cgit_print_pageheader(char *title, int show_search)
html("<tr><td class='sidebar'>\n<a href='"); html("<tr><td class='sidebar'>\n<a href='");
html_attr(cgit_rooturl()); html_attr(cgit_rooturl());
htmlf("'><img src='%s' alt='cgit'/></a>\n", htmlf("'><img src='%s' alt='cgit'/></a>\n",
ctx.cfg.logo); ctx->cfg.logo);
html("</td></tr>\n<tr><td class='sidebar'>\n"); html("</td></tr>\n<tr><td class='sidebar'>\n");
if (ctx.repo) { if (ctx->repo) {
html("<h1 class='first'>"); html("<h1 class='first'>");
html_txt(strrpart(ctx.repo->name, 20)); html_txt(strrpart(ctx->repo->name, 20));
html("</h1>\n"); html("</h1>\n");
html_txt(ctx.repo->desc); html_txt(ctx->repo->desc);
if (ctx.repo->owner) { if (ctx->repo->owner) {
html("<h1>owner</h1>\n"); html("<h1>owner</h1>\n");
html_txt(ctx.repo->owner); html_txt(ctx->repo->owner);
} }
html("<h1>navigate</h1>\n"); html("<h1>navigate</h1>\n");
reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head, reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
NULL, NULL); NULL, NULL);
cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL, cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
0, NULL, NULL); 0, NULL, NULL);
cgit_tree_link("tree", NULL, "menu", ctx.qry.head, cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
ctx.qry.sha1, NULL); ctx->qry.sha1, NULL);
cgit_commit_link("commit", NULL, "menu", ctx.qry.head, cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
ctx.qry.sha1); ctx->qry.sha1);
cgit_diff_link("diff", NULL, "menu", ctx.qry.head, cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
ctx.qry.sha1, ctx.qry.sha2, NULL); ctx->qry.sha1, ctx->qry.sha2, NULL);
cgit_patch_link("patch", NULL, "menu", ctx.qry.head, cgit_patch_link("patch", NULL, "menu", ctx->qry.head,
ctx.qry.sha1); ctx->qry.sha1);
for_each_ref(print_archive_ref, &header); for_each_ref(print_archive_ref, &header);
if (ctx.repo->clone_url || ctx.cfg.clone_prefix) { if (ctx->repo->clone_url || ctx->cfg.clone_prefix) {
html("<h1>clone</h1>\n"); html("<h1>clone</h1>\n");
if (ctx.repo->clone_url) if (ctx->repo->clone_url)
url = ctx.repo->clone_url; url = ctx->repo->clone_url;
else else
url = fmt("%s%s", ctx.cfg.clone_prefix, url = fmt("%s%s", ctx->cfg.clone_prefix,
ctx.repo->url); ctx->repo->url);
html("<a class='menu' href='"); html("<a class='menu' href='");
html_attr(url); html_attr(url);
html("' title='"); html("' title='");
@ -520,10 +522,10 @@ void cgit_print_pageheader(char *title, int show_search)
html("<h1>branch</h1>\n"); html("<h1>branch</h1>\n");
html("<form method='get' action=''>\n"); html("<form method='get' action=''>\n");
add_hidden_formfields(0, 1, ctx.qry.page); add_hidden_formfields(0, 1, ctx->qry.page);
// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
html("<select name='h' onchange='this.form.submit();'>\n"); html("<select name='h' onchange='this.form.submit();'>\n");
for_each_branch_ref(print_branch_option, ctx.qry.head); for_each_branch_ref(print_branch_option, ctx->qry.head);
html("</select>\n"); html("</select>\n");
// html("</td><td>"); // html("</td><td>");
html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
@ -532,22 +534,22 @@ void cgit_print_pageheader(char *title, int show_search)
html("<h1>search</h1>\n"); html("<h1>search</h1>\n");
html("<form method='get' action='"); html("<form method='get' action='");
if (ctx.cfg.virtual_root) if (ctx->cfg.virtual_root)
html_attr(cgit_fileurl(ctx.qry.repo, "log", html_attr(cgit_fileurl(ctx->qry.repo, "log",
ctx.qry.path, NULL)); ctx->qry.path, NULL));
html("'>\n"); html("'>\n");
add_hidden_formfields(1, 0, "log"); add_hidden_formfields(1, 0, "log");
html("<select name='qt'>\n"); html("<select name='qt'>\n");
html_option("grep", "log msg", ctx.qry.grep); html_option("grep", "log msg", ctx->qry.grep);
html_option("author", "author", ctx.qry.grep); html_option("author", "author", ctx->qry.grep);
html_option("committer", "committer", ctx.qry.grep); html_option("committer", "committer", ctx->qry.grep);
html("</select>\n"); html("</select>\n");
html("<input class='txt' type='text' name='q' value='"); html("<input class='txt' type='text' name='q' value='");
html_attr(ctx.qry.search); html_attr(ctx->qry.search);
html("'/>\n"); html("'/>\n");
html("</form>\n"); html("</form>\n");
} else { } else {
if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info)) if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info))
html(default_info); html(default_info);
} }
@ -556,18 +558,6 @@ void cgit_print_pageheader(char *title, int show_search)
html("<td id='content'>\n"); html("<td id='content'>\n");
} }
void cgit_print_snapshot_start(const char *mimetype, const char *filename,
struct cacheitem *item)
{
htmlf("Content-Type: %s\n", mimetype);
htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
htmlf("Expires: %s\n", http_date(item->st.st_mtime +
ttl_seconds(item->ttl)));
html("\n");
}
void cgit_print_filemode(unsigned short mode) void cgit_print_filemode(unsigned short mode)
{ {
if (S_ISDIR(mode)) if (S_ISDIR(mode))

4
ui-snapshot.c
Unescape View File

@ -101,7 +101,9 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
args.base = fmt("%s/", prefix); args.base = fmt("%s/", prefix);
args.tree = commit->tree; args.tree = commit->tree;
args.time = commit->date; args.time = commit->date;
cgit_print_snapshot_start(sat->mimetype, filename, item); ctx.page.mimetype = xstrdup(sat->mimetype);
ctx.page.filename = xstrdup(filename);
cgit_print_http_headers(&ctx);
(*sat->write_func)(&args); (*sat->write_func)(&args);
return; return;
} }

Write Preview
Loading…
Cancel
Save