X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=be6ce2e6bc9f2b8efb60314662c97714710e0362;hb=e358bd7a3833f8c5bf9db57d228888f9c5f3692e;hp=34f32c0bdcdb088f056baa12e383622339321c0d;hpb=7a9035643fc19b89699093dfda1eb3f32c4c29a9;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 34f32c0b..be6ce2e6 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -7,13 +7,19 @@ use strict; use warnings; use PublicInbox::Hval qw(ascii_html); use URI; -use constant PI_URL => 'https://public-inbox.org/README.html'; +use constant PI_URL => 'https://public-inbox.org/'; sub new { my ($class, $ctx, $cb) = @_; bless { nr => 0, cb => $cb, ctx => $ctx }, $class; } +sub response { + my ($class, $ctx, $code, $cb) = @_; + [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], + $class->new($ctx, $cb) ] +} + sub _html_top ($) { my ($self) = @_; my $ctx = $self->{ctx}; @@ -22,10 +28,21 @@ sub _html_top ($) { my $title = $ctx->{-title_html} || $desc; my $upfx = $ctx->{-upfx} || ''; my $atom = $ctx->{-atom} || $upfx.'new.atom'; + my $tip = $ctx->{-html_tip} || ''; my $top = "$desc (Atom feed)"; if ($obj->search) { - $top = qq{
} } else { @@ -35,7 +52,7 @@ sub _html_top ($) { "" . PublicInbox::Hval::STYLE . - "$top"; + "". $top . $tip; } sub _html_end { @@ -45,13 +62,8 @@ sub _html_end { my $obj = $ctx->{-inbox}; my $desc = ascii_html($obj->description); - # FIXME: cleanup - my $env = $ctx->{env}; - my $scheme = $env->{'psgi.url_scheme'}; - my $host_port = $env->{HTTP_HOST} || - "$env->{SERVER_NAME}:$env->{SERVER_PORT}"; - my $http = "$scheme://$host_port".($env->{SCRIPT_NAME} || '/'); - $http = URI->new($http . $obj->{name})->canonical->as_string; + my $http = $obj->base_url($ctx->{env}); + chop $http; my %seen = ( $http => 1 ); my @urls = ($http); foreach my $u (@{$obj->cloneurl}) { @@ -69,8 +81,8 @@ sub _html_end { ''.join("\n", '- ' . $desc, $urls, - 'served with software from public-inbox: ' - ."$url", + 'Archived served using code from public-inbox:', + qq(\tgit clone $url public-inbox), ).'