author | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:00:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:00:27 (UTC) |
commit | f34478cbe0214a201e7ecef3e79ed6c957b7beee (patch) (unidiff) | |
tree | 1ee05da742488cab51a06e083d26b7b58d829b43 /ui-shared.c | |
parent | e0e4478e7b4812f822d60a13a33525f8e529e1e8 (diff) | |
download | cgit-f34478cbe0214a201e7ecef3e79ed6c957b7beee.zip cgit-f34478cbe0214a201e7ecef3e79ed6c957b7beee.tar.gz cgit-f34478cbe0214a201e7ecef3e79ed6c957b7beee.tar.bz2 |
Refactor snapshot support
The snapshot support needs to be split between output- and config-related
functions to get the layering between shared.c and ui-*.c right. There
is also some codestyle-issues which needs fixing to make the snapshot
functions more similar to the rest of the cgit code.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 2596023..aa65988 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -320,257 +320,272 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
320 | secs = now - t; | 320 | secs = now - t; |
321 | 321 | ||
322 | if (secs > max_relative && max_relative >= 0) { | 322 | if (secs > max_relative && max_relative >= 0) { |
323 | cgit_print_date(t, format); | 323 | cgit_print_date(t, format); |
324 | return; | 324 | return; |
325 | } | 325 | } |
326 | 326 | ||
327 | if (secs < TM_HOUR * 2) { | 327 | if (secs < TM_HOUR * 2) { |
328 | htmlf("<span class='age-mins'>%.0f min.</span>", | 328 | htmlf("<span class='age-mins'>%.0f min.</span>", |
329 | secs * 1.0 / TM_MIN); | 329 | secs * 1.0 / TM_MIN); |
330 | return; | 330 | return; |
331 | } | 331 | } |
332 | if (secs < TM_DAY * 2) { | 332 | if (secs < TM_DAY * 2) { |
333 | htmlf("<span class='age-hours'>%.0f hours</span>", | 333 | htmlf("<span class='age-hours'>%.0f hours</span>", |
334 | secs * 1.0 / TM_HOUR); | 334 | secs * 1.0 / TM_HOUR); |
335 | return; | 335 | return; |
336 | } | 336 | } |
337 | if (secs < TM_WEEK * 2) { | 337 | if (secs < TM_WEEK * 2) { |
338 | htmlf("<span class='age-days'>%.0f days</span>", | 338 | htmlf("<span class='age-days'>%.0f days</span>", |
339 | secs * 1.0 / TM_DAY); | 339 | secs * 1.0 / TM_DAY); |
340 | return; | 340 | return; |
341 | } | 341 | } |
342 | if (secs < TM_MONTH * 2) { | 342 | if (secs < TM_MONTH * 2) { |
343 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 343 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
344 | secs * 1.0 / TM_WEEK); | 344 | secs * 1.0 / TM_WEEK); |
345 | return; | 345 | return; |
346 | } | 346 | } |
347 | if (secs < TM_YEAR * 2) { | 347 | if (secs < TM_YEAR * 2) { |
348 | htmlf("<span class='age-months'>%.0f months</span>", | 348 | htmlf("<span class='age-months'>%.0f months</span>", |
349 | secs * 1.0 / TM_MONTH); | 349 | secs * 1.0 / TM_MONTH); |
350 | return; | 350 | return; |
351 | } | 351 | } |
352 | htmlf("<span class='age-years'>%.0f years</span>", | 352 | htmlf("<span class='age-years'>%.0f years</span>", |
353 | secs * 1.0 / TM_YEAR); | 353 | secs * 1.0 / TM_YEAR); |
354 | } | 354 | } |
355 | 355 | ||
356 | void cgit_print_http_headers(struct cgit_context *ctx) | 356 | void cgit_print_http_headers(struct cgit_context *ctx) |
357 | { | 357 | { |
358 | if (ctx->page.mimetype && ctx->page.charset) | 358 | if (ctx->page.mimetype && ctx->page.charset) |
359 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 359 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
360 | ctx->page.charset); | 360 | ctx->page.charset); |
361 | else if (ctx->page.mimetype) | 361 | else if (ctx->page.mimetype) |
362 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 362 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
363 | if (ctx->page.filename) | 363 | if (ctx->page.filename) |
364 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 364 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
365 | ctx->page.filename); | 365 | ctx->page.filename); |
366 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 366 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
367 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 367 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
368 | html("\n"); | 368 | html("\n"); |
369 | } | 369 | } |
370 | 370 | ||
371 | void cgit_print_docstart(struct cgit_context *ctx) | 371 | void cgit_print_docstart(struct cgit_context *ctx) |
372 | { | 372 | { |
373 | html(cgit_doctype); | 373 | html(cgit_doctype); |
374 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 374 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
375 | html("<head>\n"); | 375 | html("<head>\n"); |
376 | html("<title>"); | 376 | html("<title>"); |
377 | html_txt(ctx->page.title); | 377 | html_txt(ctx->page.title); |
378 | html("</title>\n"); | 378 | html("</title>\n"); |
379 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 379 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
380 | if (ctx->cfg.robots && *ctx->cfg.robots) | 380 | if (ctx->cfg.robots && *ctx->cfg.robots) |
381 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 381 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
382 | html("<link rel='stylesheet' type='text/css' href='"); | 382 | html("<link rel='stylesheet' type='text/css' href='"); |
383 | html_attr(ctx->cfg.css); | 383 | html_attr(ctx->cfg.css); |
384 | html("'/>\n"); | 384 | html("'/>\n"); |
385 | html("</head>\n"); | 385 | html("</head>\n"); |
386 | html("<body>\n"); | 386 | html("<body>\n"); |
387 | } | 387 | } |
388 | 388 | ||
389 | void cgit_print_docend() | 389 | void cgit_print_docend() |
390 | { | 390 | { |
391 | html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); | 391 | html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); |
392 | } | 392 | } |
393 | 393 | ||
394 | int print_branch_option(const char *refname, const unsigned char *sha1, | 394 | int print_branch_option(const char *refname, const unsigned char *sha1, |
395 | int flags, void *cb_data) | 395 | int flags, void *cb_data) |
396 | { | 396 | { |
397 | char *name = (char *)refname; | 397 | char *name = (char *)refname; |
398 | html_option(name, name, ctx.qry.head); | 398 | html_option(name, name, ctx.qry.head); |
399 | return 0; | 399 | return 0; |
400 | } | 400 | } |
401 | 401 | ||
402 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 402 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
403 | int flags, void *cb_data) | 403 | int flags, void *cb_data) |
404 | { | 404 | { |
405 | struct tag *tag; | 405 | struct tag *tag; |
406 | struct taginfo *info; | 406 | struct taginfo *info; |
407 | struct object *obj; | 407 | struct object *obj; |
408 | char buf[256], *url; | 408 | char buf[256], *url; |
409 | unsigned char fileid[20]; | 409 | unsigned char fileid[20]; |
410 | int *header = (int *)cb_data; | 410 | int *header = (int *)cb_data; |
411 | 411 | ||
412 | if (prefixcmp(refname, "refs/archives")) | 412 | if (prefixcmp(refname, "refs/archives")) |
413 | return 0; | 413 | return 0; |
414 | strncpy(buf, refname+14, sizeof(buf)); | 414 | strncpy(buf, refname+14, sizeof(buf)); |
415 | obj = parse_object(sha1); | 415 | obj = parse_object(sha1); |
416 | if (!obj) | 416 | if (!obj) |
417 | return 1; | 417 | return 1; |
418 | if (obj->type == OBJ_TAG) { | 418 | if (obj->type == OBJ_TAG) { |
419 | tag = lookup_tag(sha1); | 419 | tag = lookup_tag(sha1); |
420 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 420 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
421 | return 0; | 421 | return 0; |
422 | hashcpy(fileid, tag->tagged->sha1); | 422 | hashcpy(fileid, tag->tagged->sha1); |
423 | } else if (obj->type != OBJ_BLOB) { | 423 | } else if (obj->type != OBJ_BLOB) { |
424 | return 0; | 424 | return 0; |
425 | } else { | 425 | } else { |
426 | hashcpy(fileid, sha1); | 426 | hashcpy(fileid, sha1); |
427 | } | 427 | } |
428 | if (!*header) { | 428 | if (!*header) { |
429 | html("<h1>download</h1>\n"); | 429 | html("<h1>download</h1>\n"); |
430 | *header = 1; | 430 | *header = 1; |
431 | } | 431 | } |
432 | url = cgit_pageurl(ctx.qry.repo, "blob", | 432 | url = cgit_pageurl(ctx.qry.repo, "blob", |
433 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 433 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
434 | buf)); | 434 | buf)); |
435 | html_link_open(url, NULL, "menu"); | 435 | html_link_open(url, NULL, "menu"); |
436 | html_txt(strlpart(buf, 20)); | 436 | html_txt(strlpart(buf, 20)); |
437 | html_link_close(); | 437 | html_link_close(); |
438 | return 0; | 438 | return 0; |
439 | } | 439 | } |
440 | 440 | ||
441 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 441 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
442 | { | 442 | { |
443 | char *url; | 443 | char *url; |
444 | 444 | ||
445 | if (!ctx.cfg.virtual_root) { | 445 | if (!ctx.cfg.virtual_root) { |
446 | url = fmt("%s/%s", ctx.qry.repo, page); | 446 | url = fmt("%s/%s", ctx.qry.repo, page); |
447 | if (ctx.qry.path) | 447 | if (ctx.qry.path) |
448 | url = fmt("%s/%s", url, ctx.qry.path); | 448 | url = fmt("%s/%s", url, ctx.qry.path); |
449 | html_hidden("url", url); | 449 | html_hidden("url", url); |
450 | } | 450 | } |
451 | 451 | ||
452 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) | 452 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) |
453 | html_hidden("h", ctx.qry.head); | 453 | html_hidden("h", ctx.qry.head); |
454 | 454 | ||
455 | if (ctx.qry.sha1) | 455 | if (ctx.qry.sha1) |
456 | html_hidden("id", ctx.qry.sha1); | 456 | html_hidden("id", ctx.qry.sha1); |
457 | if (ctx.qry.sha2) | 457 | if (ctx.qry.sha2) |
458 | html_hidden("id2", ctx.qry.sha2); | 458 | html_hidden("id2", ctx.qry.sha2); |
459 | 459 | ||
460 | if (incl_search) { | 460 | if (incl_search) { |
461 | if (ctx.qry.grep) | 461 | if (ctx.qry.grep) |
462 | html_hidden("qt", ctx.qry.grep); | 462 | html_hidden("qt", ctx.qry.grep); |
463 | if (ctx.qry.search) | 463 | if (ctx.qry.search) |
464 | html_hidden("q", ctx.qry.search); | 464 | html_hidden("q", ctx.qry.search); |
465 | } | 465 | } |
466 | } | 466 | } |
467 | 467 | ||
468 | void cgit_print_pageheader(struct cgit_context *ctx) | 468 | void cgit_print_pageheader(struct cgit_context *ctx) |
469 | { | 469 | { |
470 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; | 470 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; |
471 | int header = 0; | 471 | int header = 0; |
472 | char *url; | 472 | char *url; |
473 | 473 | ||
474 | html("<table id='layout' summary=''>\n"); | 474 | html("<table id='layout' summary=''>\n"); |
475 | html("<tr><td id='sidebar'>\n"); | 475 | html("<tr><td id='sidebar'>\n"); |
476 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); | 476 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); |
477 | html("<tr><td class='sidebar'>\n<a href='"); | 477 | html("<tr><td class='sidebar'>\n<a href='"); |
478 | html_attr(cgit_rooturl()); | 478 | html_attr(cgit_rooturl()); |
479 | htmlf("'><img src='%s' alt='cgit'/></a>\n", | 479 | htmlf("'><img src='%s' alt='cgit'/></a>\n", |
480 | ctx->cfg.logo); | 480 | ctx->cfg.logo); |
481 | html("</td></tr>\n<tr><td class='sidebar'>\n"); | 481 | html("</td></tr>\n<tr><td class='sidebar'>\n"); |
482 | if (ctx->repo) { | 482 | if (ctx->repo) { |
483 | html("<h1 class='first'>"); | 483 | html("<h1 class='first'>"); |
484 | html_txt(strrpart(ctx->repo->name, 20)); | 484 | html_txt(strrpart(ctx->repo->name, 20)); |
485 | html("</h1>\n"); | 485 | html("</h1>\n"); |
486 | html_txt(ctx->repo->desc); | 486 | html_txt(ctx->repo->desc); |
487 | if (ctx->repo->owner) { | 487 | if (ctx->repo->owner) { |
488 | html("<h1>owner</h1>\n"); | 488 | html("<h1>owner</h1>\n"); |
489 | html_txt(ctx->repo->owner); | 489 | html_txt(ctx->repo->owner); |
490 | } | 490 | } |
491 | html("<h1>navigate</h1>\n"); | 491 | html("<h1>navigate</h1>\n"); |
492 | reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head, | 492 | reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head, |
493 | NULL, NULL); | 493 | NULL, NULL); |
494 | cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL, | 494 | cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL, |
495 | 0, NULL, NULL); | 495 | 0, NULL, NULL); |
496 | cgit_tree_link("tree", NULL, "menu", ctx->qry.head, | 496 | cgit_tree_link("tree", NULL, "menu", ctx->qry.head, |
497 | ctx->qry.sha1, NULL); | 497 | ctx->qry.sha1, NULL); |
498 | cgit_commit_link("commit", NULL, "menu", ctx->qry.head, | 498 | cgit_commit_link("commit", NULL, "menu", ctx->qry.head, |
499 | ctx->qry.sha1); | 499 | ctx->qry.sha1); |
500 | cgit_diff_link("diff", NULL, "menu", ctx->qry.head, | 500 | cgit_diff_link("diff", NULL, "menu", ctx->qry.head, |
501 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 501 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
502 | cgit_patch_link("patch", NULL, "menu", ctx->qry.head, | 502 | cgit_patch_link("patch", NULL, "menu", ctx->qry.head, |
503 | ctx->qry.sha1); | 503 | ctx->qry.sha1); |
504 | 504 | ||
505 | for_each_ref(print_archive_ref, &header); | 505 | for_each_ref(print_archive_ref, &header); |
506 | 506 | ||
507 | if (ctx->repo->clone_url || ctx->cfg.clone_prefix) { | 507 | if (ctx->repo->clone_url || ctx->cfg.clone_prefix) { |
508 | html("<h1>clone</h1>\n"); | 508 | html("<h1>clone</h1>\n"); |
509 | if (ctx->repo->clone_url) | 509 | if (ctx->repo->clone_url) |
510 | url = ctx->repo->clone_url; | 510 | url = ctx->repo->clone_url; |
511 | else | 511 | else |
512 | url = fmt("%s%s", ctx->cfg.clone_prefix, | 512 | url = fmt("%s%s", ctx->cfg.clone_prefix, |
513 | ctx->repo->url); | 513 | ctx->repo->url); |
514 | html("<a class='menu' href='"); | 514 | html("<a class='menu' href='"); |
515 | html_attr(url); | 515 | html_attr(url); |
516 | html("' title='"); | 516 | html("' title='"); |
517 | html_attr(url); | 517 | html_attr(url); |
518 | html("'>\n"); | 518 | html("'>\n"); |
519 | html_txt(strrpart(url, 20)); | 519 | html_txt(strrpart(url, 20)); |
520 | html("</a>\n"); | 520 | html("</a>\n"); |
521 | } | 521 | } |
522 | 522 | ||
523 | html("<h1>branch</h1>\n"); | 523 | html("<h1>branch</h1>\n"); |
524 | html("<form method='get' action=''>\n"); | 524 | html("<form method='get' action=''>\n"); |
525 | add_hidden_formfields(0, 1, ctx->qry.page); | 525 | add_hidden_formfields(0, 1, ctx->qry.page); |
526 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); | 526 | // html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); |
527 | html("<select name='h' onchange='this.form.submit();'>\n"); | 527 | html("<select name='h' onchange='this.form.submit();'>\n"); |
528 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 528 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
529 | html("</select>\n"); | 529 | html("</select>\n"); |
530 | // html("</td><td>"); | 530 | // html("</td><td>"); |
531 | html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); | 531 | html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n"); |
532 | // html("</td></tr></table>"); | 532 | // html("</td></tr></table>"); |
533 | html("</form>\n"); | 533 | html("</form>\n"); |
534 | 534 | ||
535 | html("<h1>search</h1>\n"); | 535 | html("<h1>search</h1>\n"); |
536 | html("<form method='get' action='"); | 536 | html("<form method='get' action='"); |
537 | if (ctx->cfg.virtual_root) | 537 | if (ctx->cfg.virtual_root) |
538 | html_attr(cgit_fileurl(ctx->qry.repo, "log", | 538 | html_attr(cgit_fileurl(ctx->qry.repo, "log", |
539 | ctx->qry.path, NULL)); | 539 | ctx->qry.path, NULL)); |
540 | html("'>\n"); | 540 | html("'>\n"); |
541 | add_hidden_formfields(1, 0, "log"); | 541 | add_hidden_formfields(1, 0, "log"); |
542 | html("<select name='qt'>\n"); | 542 | html("<select name='qt'>\n"); |
543 | html_option("grep", "log msg", ctx->qry.grep); | 543 | html_option("grep", "log msg", ctx->qry.grep); |
544 | html_option("author", "author", ctx->qry.grep); | 544 | html_option("author", "author", ctx->qry.grep); |
545 | html_option("committer", "committer", ctx->qry.grep); | 545 | html_option("committer", "committer", ctx->qry.grep); |
546 | html("</select>\n"); | 546 | html("</select>\n"); |
547 | html("<input class='txt' type='text' name='q' value='"); | 547 | html("<input class='txt' type='text' name='q' value='"); |
548 | html_attr(ctx->qry.search); | 548 | html_attr(ctx->qry.search); |
549 | html("'/>\n"); | 549 | html("'/>\n"); |
550 | html("</form>\n"); | 550 | html("</form>\n"); |
551 | } else { | 551 | } else { |
552 | if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info)) | 552 | if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info)) |
553 | html(default_info); | 553 | html(default_info); |
554 | } | 554 | } |
555 | 555 | ||
556 | html("</td></tr></table></td>\n"); | 556 | html("</td></tr></table></td>\n"); |
557 | 557 | ||
558 | html("<td id='content'>\n"); | 558 | html("<td id='content'>\n"); |
559 | } | 559 | } |
560 | 560 | ||
561 | void cgit_print_filemode(unsigned short mode) | 561 | void cgit_print_filemode(unsigned short mode) |
562 | { | 562 | { |
563 | if (S_ISDIR(mode)) | 563 | if (S_ISDIR(mode)) |
564 | html("d"); | 564 | html("d"); |
565 | else if (S_ISLNK(mode)) | 565 | else if (S_ISLNK(mode)) |
566 | html("l"); | 566 | html("l"); |
567 | else if (S_ISGITLINK(mode)) | 567 | else if (S_ISGITLINK(mode)) |
568 | html("m"); | 568 | html("m"); |
569 | else | 569 | else |
570 | html("-"); | 570 | html("-"); |
571 | html_fileperm(mode >> 6); | 571 | html_fileperm(mode >> 6); |
572 | html_fileperm(mode >> 3); | 572 | html_fileperm(mode >> 3); |
573 | html_fileperm(mode); | 573 | html_fileperm(mode); |
574 | } | 574 | } |
575 | 575 | ||
576 | /* vim:set sw=8: */ | 576 | void cgit_print_snapshot_links(const char *repo, const char *head, |
577 | const char *hex, int snapshots) | ||
578 | { | ||
579 | const struct cgit_snapshot_format* f; | ||
580 | char *filename; | ||
581 | |||
582 | for (f = cgit_snapshot_formats; f->suffix; f++) { | ||
583 | if (!(snapshots & f->bit)) | ||
584 | continue; | ||
585 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | ||
586 | f->suffix); | ||
587 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | ||
588 | (char *)hex, filename); | ||
589 | html("<br/>"); | ||
590 | } | ||
591 | } | ||