X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=34e124358d5e588cfae0f8f9cbfb730e33ee921c;hp=29395f40909661ec2231304677a4d33a5dbbae35;hb=0d38f65c490466837ae091afa7a7b6f59d04ce7c;hpb=b7c4bca292fb1f7ac4d73ff96b2ce95185b4fc66 diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 29395f40..34e12435 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -1,49 +1,64 @@ -# Copyright (C) 2016 all contributors +# Copyright (C) 2016-2020 all contributors # License: AGPL-3.0+ # -# HTML body stream for which yields getline+close methods +# HTML body stream for which yields getline+close methods for +# generic PSGI servers and callbacks for public-inbox-httpd. +# +# See PublicInbox::GzipFilter parent class for more info. package PublicInbox::WwwStream; use strict; -use warnings; -use PublicInbox::Hval qw(ascii_html); -use URI; +use parent qw(Exporter PublicInbox::GzipFilter); +our @EXPORT_OK = qw(html_oneshot); +use bytes (); # length +use PublicInbox::Hval qw(ascii_html prurl ts2str); our $TOR_URL = 'https://www.torproject.org/'; -our $CODE_URL = 'https://public-inbox.org/'; -our $PROJECT = 'public-inbox'; +our $CODE_URL = 'https://public-inbox.org/public-inbox.git'; -sub close {} +sub base_url ($) { + my $ctx = shift; + my $base_url = $ctx->{ibx}->base_url($ctx->{env}); + chop $base_url; # no trailing slash for clone + $base_url; +} -sub new { - my ($class, $ctx, $cb) = @_; - bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class; +sub init { + my ($ctx, $cb) = @_; + $ctx->{cb} = $cb; + $ctx->{base_url} = base_url($ctx); + bless $ctx, __PACKAGE__; } -sub response { - my ($class, $ctx, $code, $cb) = @_; - [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], - $class->new($ctx, $cb) ] +sub async_eml { # for async_blob_cb + my ($ctx, $eml) = @_; + $ctx->{http_out}->write($ctx->translate($ctx->{cb}->($ctx, $eml))); } -sub _html_top ($) { - my ($self) = @_; - my $ctx = $self->{ctx}; - my $obj = $ctx->{-inbox}; - my $desc = ascii_html($obj->description); - my $title = $ctx->{-title_html} || $desc; +sub html_top ($) { + my ($ctx) = @_; + my $ibx = $ctx->{ibx}; + my $desc = ascii_html($ibx->description); + my $title = delete($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"; - my $links = "Atom feed"; - if ($obj->search) { - my $q_val = $ctx->{-q_value_html}; - if (defined $q_val && $q_val ne '') { - $q_val = qq(\nvalue="$q_val"); - } else { - $q_val = ''; - } + if (my $t_max = $ctx->{-t_max}) { + $t_max = ts2str($t_max); + $top = qq($top); + # we had some kind of query, link to /$INBOX/?t=YYYYMMDDhhmmss + } elsif ($ctx->{qp}->{t}) { + $top = qq($top); + } + my $links = qq(help / ). + qq(color / ). + qq(mirror / ). + qq(Atom feed); + if ($ibx->isrch) { + my $q_val = delete($ctx->{-q_value_html}) // ''; + $q_val = qq(\nvalue="$q_val") if $q_val ne ''; # XXX gross, for SearchView.pm - my $extra = $ctx->{-extra_form_html} || ''; + my $extra = delete($ctx->{-extra_form_html}) // ''; my $action = $upfx eq '' ? './' : $upfx; $top = qq{
$top} .
 			  qq{\n} .
@@ -55,61 +70,167 @@ sub _html_top ($) {
 		$top = '
' . $top . "\n" . $links . '
';
 	}
 	"$title" .
-		"" .
-		PublicInbox::Hval::STYLE .
-		"". $top . $tip;
+		qq() .
+	        $ctx->{www}->style($upfx) .
+		''. $top . (delete($ctx->{-html_tip}) // '');
+}
+
+sub coderepos ($) {
+	my ($ctx) = @_;
+	my $ibx = $ctx->{ibx};
+	my @ret;
+	if (defined(my $cr = $ibx->{coderepo})) {
+		my $cfg = $ctx->{www}->{pi_cfg};
+		my $env = $ctx->{env};
+		for my $cr_name (@$cr) {
+			my $urls = $cfg->{"coderepo.$cr_name.cgiturl"};
+			if ($urls) {
+				$ret[0] //= <$u)
 }
 
 sub _html_end {
-	my ($self) = @_;
-	my $urls = 'Archives are clonable:';
-	my $ctx = $self->{ctx};
-	my $obj = $ctx->{-inbox};
-	my $desc = ascii_html($obj->description);
-
-	my $http = $obj->base_url($ctx->{env});
-	chop $http;
-	my %seen = ( $http => 1 );
-	my @urls = ($http);
-	my $need_tor;
-	foreach my $u (@{$obj->cloneurl}) {
-		next if $seen{$u};
-		$need_tor = 1 if $u =~ m!\A[^:]+://\w+\.onion/!;
-		$seen{$u} = 1;
-		push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u;
+	my ($ctx) = @_;
+	my $urls = <This inbox may be cloned and mirrored by anyone:
+EOF
+
+	my $ibx = $ctx->{ibx};
+	my $desc = ascii_html($ibx->description);
+
+	my @urls;
+	my $http = $ctx->{base_url};
+	my $max = $ibx->max_git_epoch;
+	my $dir = (split(m!/!, $http))[-1];
+	my %seen = ($http => 1);
+	if (defined($max)) { # v2
+		for my $i (0..$max) {
+			# old epochs my be deleted:
+			-d "$ibx->{inboxdir}/git/$i.git" or next;
+			my $url = "$http/$i";
+			$seen{$url} = 1;
+			push @urls, "$url $dir/git/$i.git";
+		}
+		my $nr = scalar(@urls);
+		if ($nr > 1) {
+			$urls .= "\n\t# this inbox consists of $nr epochs:";
+			$urls[0] .= "\t# oldest";
+			$urls[-1] .= "\t# newest";
+		}
+	} else { # v1
+		push @urls, $http;
 	}
-	if (scalar(@urls) == 1) {
-		$urls .= " git clone --mirror $http";
-	} else {
-		$urls .= "\n" .
-			join("\n", map { "\tgit clone --mirror $_" } @urls);
+
+	# FIXME: epoch splits can be different in other repositories,
+	# use the "cloneurl" file as-is for now:
+	foreach my $u (@{$ibx->cloneurl}) {
+		next if $seen{$u}++;
+		push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u;
 	}
 
-	if ($need_tor) {
-		$urls .= "\n note: .onion URLs require Tor: ";
+	$urls .= "\n" . join('', map { "\tgit clone --mirror $_\n" } @urls);
+	my $addrs = $ibx->{address};
+	$addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY';
+	my $v = defined $max ? '-V2' : '-V1';
+	$urls .= <{name} $dir/ $http \\
+		$addrs
+	public-inbox-index $dir
+EOF
+	my $cfg_link = ($ctx->{-upfx} // '').'_/text/config/raw';
+	$urls .= <config snippet for mirrors.
+EOF
+	my @nntp = map { qq($_) } @{$ibx->nntp_url};
+	if (@nntp) {
+		$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 .= " note: .onion URLs require Tor: ";
 		$urls .= qq[$TOR_URL];
 	}
-	my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
 	'
'.join("\n\n",
 		$desc,
 		$urls,
-		'Code for this site: '.
-		qq(git clone $url $PROJECT)
+		coderepos($ctx),
+		code_footer($ctx->{env})
 	).'
';
 }
 
+# callback for HTTP.pm (and any other PSGI servers)
 sub getline {
-	my ($self) = @_;
-	my $nr = $self->{nr}++;
+	my ($ctx) = @_;
+	my $cb = $ctx->{cb} or return;
+	while (defined(my $x = $cb->($ctx))) { # x = smsg or scalar non-ref
+		if (ref($x)) { # smsg
+			my $eml = $ctx->{ibx}->smsg_eml($x) or next;
+			$ctx->{smsg} = $x;
+			return $ctx->translate($cb->($ctx, $eml));
+		} else { # scalar
+			return $ctx->translate($x);
+		}
+	}
+	delete $ctx->{cb};
+	$ctx->zflush(_html_end($ctx));
+}
 
-	return _html_top($self) if $nr == 0;
+sub html_oneshot ($$;$) {
+	my ($ctx, $code, $sref) = @_;
+	my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8',
+		'Content-Length' => undef ];
+	bless $ctx, __PACKAGE__;
+	$ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($res_hdr, $ctx->{env});
+	$ctx->{base_url} //= do {
+		$ctx->zmore(html_top($ctx));
+		base_url($ctx);
+	};
+	$ctx->zmore($$sref) if $sref;
+	my $bdy = $ctx->zflush(_html_end($ctx));
+	$res_hdr->[3] = bytes::length($bdy);
+	[ $code, $res_hdr, [ $bdy ] ]
+}
 
-	if (my $mid = $self->{cb}) { # middle
-		$mid = $mid->($nr, $self->{ctx}) and return $mid;
-	}
+sub async_next ($) {
+	my ($http) = @_; # PublicInbox::HTTP
+	my $ctx = $http->{forward} or return;
+	eval {
+		if (my $smsg = $ctx->{smsg} = $ctx->{cb}->($ctx)) {
+			$ctx->smsg_blob($smsg);
+		} else {
+			$ctx->{http_out}->write(
+					$ctx->translate(_html_end($ctx)));
+			$ctx->close; # GzipFilter->close
+		}
+	};
+	warn "E: $@" if $@;
+}
 
-	delete $self->{cb} ? _html_end($self) : undef;
+sub aresponse {
+	my ($ctx, $code, $cb) = @_;
+	my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8' ];
+	init($ctx, $cb);
+	$ctx->psgi_response($code, $res_hdr);
 }
 
 1;