summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
authorLars Hjemli <hjemli@gmail.com>2009-02-19 21:38:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-19 21:38:36 (UTC)
commit488a214a81a25c6397c56822ed1713f51dddc520 (patch) (unidiff)
tree93b3be74f6c7b3ae6557a9d3c5c2856ff5efe8ed /ui-shared.c
parent6063e7b5532481ffaa7a6f080de28547983bbeb7 (diff)
downloadcgit-488a214a81a25c6397c56822ed1713f51dddc520.zip
cgit-488a214a81a25c6397c56822ed1713f51dddc520.tar.gz
cgit-488a214a81a25c6397c56822ed1713f51dddc520.tar.bz2
Add support for ETag in 'plain' view
When downloading a blob identified by its path, the client might want to know if the blob has been modified since a previous download of the same path. To this end, an ETag containing the blob SHA1 seems to be ideal. Todo: add support for HEAD requests... Suggested-by: Owen Taylor <otaylor@redhat.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..86a7d29 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -407,128 +407,130 @@ void cgit_print_date(time_t secs, char *format, int local_time)
407 time = localtime(&secs); 407 time = localtime(&secs);
408 else 408 else
409 time = gmtime(&secs); 409 time = gmtime(&secs);
410 strftime(buf, sizeof(buf)-1, format, time); 410 strftime(buf, sizeof(buf)-1, format, time);
411 html_txt(buf); 411 html_txt(buf);
412} 412}
413 413
414void cgit_print_age(time_t t, time_t max_relative, char *format) 414void cgit_print_age(time_t t, time_t max_relative, char *format)
415{ 415{
416 time_t now, secs; 416 time_t now, secs;
417 417
418 if (!t) 418 if (!t)
419 return; 419 return;
420 time(&now); 420 time(&now);
421 secs = now - t; 421 secs = now - t;
422 422
423 if (secs > max_relative && max_relative >= 0) { 423 if (secs > max_relative && max_relative >= 0) {
424 cgit_print_date(t, format, ctx.cfg.local_time); 424 cgit_print_date(t, format, ctx.cfg.local_time);
425 return; 425 return;
426 } 426 }
427 427
428 if (secs < TM_HOUR * 2) { 428 if (secs < TM_HOUR * 2) {
429 htmlf("<span class='age-mins'>%.0f min.</span>", 429 htmlf("<span class='age-mins'>%.0f min.</span>",
430 secs * 1.0 / TM_MIN); 430 secs * 1.0 / TM_MIN);
431 return; 431 return;
432 } 432 }
433 if (secs < TM_DAY * 2) { 433 if (secs < TM_DAY * 2) {
434 htmlf("<span class='age-hours'>%.0f hours</span>", 434 htmlf("<span class='age-hours'>%.0f hours</span>",
435 secs * 1.0 / TM_HOUR); 435 secs * 1.0 / TM_HOUR);
436 return; 436 return;
437 } 437 }
438 if (secs < TM_WEEK * 2) { 438 if (secs < TM_WEEK * 2) {
439 htmlf("<span class='age-days'>%.0f days</span>", 439 htmlf("<span class='age-days'>%.0f days</span>",
440 secs * 1.0 / TM_DAY); 440 secs * 1.0 / TM_DAY);
441 return; 441 return;
442 } 442 }
443 if (secs < TM_MONTH * 2) { 443 if (secs < TM_MONTH * 2) {
444 htmlf("<span class='age-weeks'>%.0f weeks</span>", 444 htmlf("<span class='age-weeks'>%.0f weeks</span>",
445 secs * 1.0 / TM_WEEK); 445 secs * 1.0 / TM_WEEK);
446 return; 446 return;
447 } 447 }
448 if (secs < TM_YEAR * 2) { 448 if (secs < TM_YEAR * 2) {
449 htmlf("<span class='age-months'>%.0f months</span>", 449 htmlf("<span class='age-months'>%.0f months</span>",
450 secs * 1.0 / TM_MONTH); 450 secs * 1.0 / TM_MONTH);
451 return; 451 return;
452 } 452 }
453 htmlf("<span class='age-years'>%.0f years</span>", 453 htmlf("<span class='age-years'>%.0f years</span>",
454 secs * 1.0 / TM_YEAR); 454 secs * 1.0 / TM_YEAR);
455} 455}
456 456
457void cgit_print_http_headers(struct cgit_context *ctx) 457void cgit_print_http_headers(struct cgit_context *ctx)
458{ 458{
459 if (ctx->page.mimetype && ctx->page.charset) 459 if (ctx->page.mimetype && ctx->page.charset)
460 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 460 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
461 ctx->page.charset); 461 ctx->page.charset);
462 else if (ctx->page.mimetype) 462 else if (ctx->page.mimetype)
463 htmlf("Content-Type: %s\n", ctx->page.mimetype); 463 htmlf("Content-Type: %s\n", ctx->page.mimetype);
464 if (ctx->page.size) 464 if (ctx->page.size)
465 htmlf("Content-Length: %ld\n", ctx->page.size); 465 htmlf("Content-Length: %ld\n", ctx->page.size);
466 if (ctx->page.filename) 466 if (ctx->page.filename)
467 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 467 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
468 ctx->page.filename); 468 ctx->page.filename);
469 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 469 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
470 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 470 htmlf("Expires: %s\n", http_date(ctx->page.expires));
471 if (ctx->page.etag)
472 htmlf("ETag: \"%s\"\n", ctx->page.etag);
471 html("\n"); 473 html("\n");
472} 474}
473 475
474void cgit_print_docstart(struct cgit_context *ctx) 476void cgit_print_docstart(struct cgit_context *ctx)
475{ 477{
476 char *host = cgit_hosturl(); 478 char *host = cgit_hosturl();
477 html(cgit_doctype); 479 html(cgit_doctype);
478 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 480 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
479 html("<head>\n"); 481 html("<head>\n");
480 html("<title>"); 482 html("<title>");
481 html_txt(ctx->page.title); 483 html_txt(ctx->page.title);
482 html("</title>\n"); 484 html("</title>\n");
483 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 485 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
484 if (ctx->cfg.robots && *ctx->cfg.robots) 486 if (ctx->cfg.robots && *ctx->cfg.robots)
485 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 487 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
486 html("<link rel='stylesheet' type='text/css' href='"); 488 html("<link rel='stylesheet' type='text/css' href='");
487 html_attr(ctx->cfg.css); 489 html_attr(ctx->cfg.css);
488 html("'/>\n"); 490 html("'/>\n");
489 if (ctx->cfg.favicon) { 491 if (ctx->cfg.favicon) {
490 html("<link rel='shortcut icon' href='"); 492 html("<link rel='shortcut icon' href='");
491 html_attr(ctx->cfg.favicon); 493 html_attr(ctx->cfg.favicon);
492 html("'/>\n"); 494 html("'/>\n");
493 } 495 }
494 if (host && ctx->repo) { 496 if (host && ctx->repo) {
495 html("<link rel='alternate' title='Atom feed' href='http://"); 497 html("<link rel='alternate' title='Atom feed' href='http://");
496 html_attr(cgit_hosturl()); 498 html_attr(cgit_hosturl());
497 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, 499 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
498 fmt("h=%s", ctx->qry.head))); 500 fmt("h=%s", ctx->qry.head)));
499 html("' type='application/atom+xml'/>"); 501 html("' type='application/atom+xml'/>");
500 } 502 }
501 html("</head>\n"); 503 html("</head>\n");
502 html("<body>\n"); 504 html("<body>\n");
503 if (ctx->cfg.header) 505 if (ctx->cfg.header)
504 html_include(ctx->cfg.header); 506 html_include(ctx->cfg.header);
505} 507}
506 508
507void cgit_print_docend() 509void cgit_print_docend()
508{ 510{
509 html("</div>"); 511 html("</div>");
510 if (ctx.cfg.footer) 512 if (ctx.cfg.footer)
511 html_include(ctx.cfg.footer); 513 html_include(ctx.cfg.footer);
512 else { 514 else {
513 htmlf("<div class='footer'>generated by cgit %s at ", 515 htmlf("<div class='footer'>generated by cgit %s at ",
514 cgit_version); 516 cgit_version);
515 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 517 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
516 html("</div>\n"); 518 html("</div>\n");
517 } 519 }
518 html("</body>\n</html>\n"); 520 html("</body>\n</html>\n");
519} 521}
520 522
521int print_branch_option(const char *refname, const unsigned char *sha1, 523int print_branch_option(const char *refname, const unsigned char *sha1,
522 int flags, void *cb_data) 524 int flags, void *cb_data)
523{ 525{
524 char *name = (char *)refname; 526 char *name = (char *)refname;
525 html_option(name, name, ctx.qry.head); 527 html_option(name, name, ctx.qry.head);
526 return 0; 528 return 0;
527} 529}
528 530
529int print_archive_ref(const char *refname, const unsigned char *sha1, 531int print_archive_ref(const char *refname, const unsigned char *sha1,
530 int flags, void *cb_data) 532 int flags, void *cb_data)
531{ 533{
532 struct tag *tag; 534 struct tag *tag;
533 struct taginfo *info; 535 struct taginfo *info;
534 struct object *obj; 536 struct object *obj;