X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=8b79923b64efeab0946e18b1b3bf03094dd6a5fc;hb=6e6f7999361925e4c944f308df4bc32a1842cd69;hp=d9abb5ab8068756d51c3f5aaae5b9098703744ce;hpb=21b7f9f282bd6b877f1da7a9d0169ce958191a34;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index d9abb5ab..8b79923b 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -1,17 +1,27 @@ -# Copyright (C) 2016 all contributors +# Copyright (C) 2016-2018 all contributors # License: AGPL-3.0+ # # HTML body stream for which yields getline+close methods +# +# public-inbox-httpd favors "getline" response bodies to take a +# "pull"-based approach to feeding slow clients (as opposed to a +# more common "push" model) package PublicInbox::WwwStream; use strict; use warnings; use PublicInbox::Hval qw(ascii_html); use URI; -use constant PI_URL => 'https://public-inbox.org/README.html'; +our $TOR_URL = 'https://www.torproject.org/'; +our $TOR2WEB_URL = 'https://www.tor2web.org/'; +our $CODE_URL = 'https://public-inbox.org/'; +our $PROJECT = 'public-inbox'; + +# noop for HTTP.pm (and any other PSGI servers) +sub close {} sub new { my ($class, $ctx, $cb) = @_; - bless { nr => 0, cb => $cb, ctx => $ctx }, $class; + bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class; } sub response { @@ -23,17 +33,22 @@ sub response { sub _html_top ($) { my ($self) = @_; my $ctx = $self->{ctx}; - my $obj = $ctx->{-inbox}; - my $desc = ascii_html($obj->description); + my $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->description); my $title = $ctx->{-title_html} || $desc; my $upfx = $ctx->{-upfx} || ''; + my $help = $upfx.'_/text/help'; + my $color = $upfx.'_/text/color'; my $atom = $ctx->{-atom} || $upfx.'new.atom'; my $tip = $ctx->{-html_tip} || ''; - my $top = "$desc (Atom feed)"; - if ($obj->search) { + my $top = "$desc"; + my $links = "help / ". + "color / ". + "Atom feed"; + if ($ibx->search) { my $q_val = $ctx->{-q_value_html}; if (defined $q_val && $q_val ne '') { - $q_val = qq(\nvalue="$q_val" ); + $q_val = qq(\nvalue="$q_val"); } else { $q_val = ''; } @@ -41,69 +56,110 @@ sub _html_top ($) { my $extra = $ctx->{-extra_form_html} || ''; my $action = $upfx eq '' ? './' : $upfx; $top = qq{
$top} .
-			  qq{ } .
+			  qq{\n} .
 			  $extra .
 			  qq{} .
+			  ' ' . $links .
 			  q{
} } else { - $top = '
' . $top . '
'; + $top = '
' . $top . "\n" . $links . '
'; } "$title" . "" . - PublicInbox::Hval::STYLE . + $ctx->{www}->style($upfx) . "". $top . $tip; } sub _html_end { my ($self) = @_; - my $urls = 'Archives are clone-able:'; + my $urls = 'Archives are clonable:'; my $ctx = $self->{ctx}; - my $obj = $ctx->{-inbox}; - my $desc = ascii_html($obj->description); + my $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->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 %seen = ( $http => 1 ); - my @urls = ($http); - foreach my $u (@{$obj->cloneurl}) { + my (%seen, @urls); + my $http = $ibx->base_url($ctx->{env}); + chop $http; # no trailing slash for clone + my $part = $ibx->max_git_part; + my $dir = (split(m!/!, $http))[-1]; + if (defined($part)) { # v2 + $seen{$http} = 1; + for my $i (0..$part) { + # old parts my be deleted: + -d "$ibx->{mainrepo}/git/$i.git" or next; + my $url = "$http/$i"; + $seen{$url} = 1; + push @urls, "$url $dir/git/$i.git"; + } + } else { # v1 + $seen{$http} = 1; + push @urls, $http; + } + + # FIXME: partitioning in can be different in other repositories, + # use the "cloneurl" file as-is for now: + foreach my $u (@{$ibx->cloneurl}) { next if $seen{$u}; $seen{$u} = 1; push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; } - if (scalar(@urls) == 1) { - $urls .= " git clone --mirror $http"; - } else { + + if (defined($part) || scalar(@urls) > 1) { $urls .= "\n" . join("\n", map { "\tgit clone --mirror $_" } @urls); + } else { + $urls .= " git clone --mirror $urls[0]"; } - my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL); - '
'.join("\n",
-		'- ' . $desc,
+	if (defined $part) {
+		my $addrs = $ibx->{address};
+		$addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY';
+		$urls .=  <{name} $dir/ $http \\
+		$addrs
+	public-inbox-index $dir
+EOF
+	}
+	my @nntp = map { qq($_) } @{$ibx->nntp_url};
+	if (@nntp) {
+		$urls .= "\n\n";
+		$urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
+		$urls .= ' available over NNTP:';
+		$urls .= "\n\t" . join("\n\t", @nntp) . "\n";
+	}
+	if ($urls =~ m!\b[^:]+://\w+\.onion/!) {
+		$urls .= "\n note: .onion URLs require Tor: ";
+		$urls .= qq[$TOR_URL];
+		if ($TOR2WEB_URL) {
+			$urls .= "\n       or Tor2web: ";
+			$urls .= qq[$TOR2WEB_URL];
+		}
+	}
+	my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
+	'
'.join("\n\n",
+		$desc,
 		$urls,
-		'served with software from public-inbox: '
-			."$url",
+		'AGPL code for this site: '.
+		qq(git clone $url $PROJECT)
 	).'
';
 }
 
+# callback for HTTP.pm (and any other PSGI servers)
 sub getline {
 	my ($self) = @_;
 	my $nr = $self->{nr}++;
 
 	return _html_top($self) if $nr == 0;
 
-	if (my $mid = $self->{cb}) { # middle
-		$mid = $mid->($nr, $self->{ctx}) and return $mid;
+	if (my $middle = $self->{cb}) {
+		$middle = $middle->($nr, $self->{ctx}) and return $middle;
 	}
 
 	delete $self->{cb} ? _html_end($self) : undef;
 }
 
-sub close {}
-
 1;