$title

X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=7399b0ad314dce3ed2adae9e059bdd9fb1488381;hb=2052e92ba1f75efca6935558ea01898d01751f40;hp=12f5fa571ec27d57eb8a11859ce944df8deb067f;hpb=58d16a4870defada082e0d5c4b9d24347d37c7be;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 12f5fa57..7399b0ad 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -1,17 +1,20 @@ -# Copyright (C) 2016 all contributors +# Copyright (C) 2016-2019 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; 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 { @@ -28,17 +31,19 @@ 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"; my $links = "help / ". + "color / ". "Atom feed"; - if ($obj->search) { + if ($ibx->search) { my $q_val = $ctx->{-q_value_html}; if (defined $q_val && $q_val ne '') { $q_val = qq(\nvalue="$q_val"); @@ -60,36 +65,77 @@ sub _html_top ($) { "$title" . "" . - PublicInbox::Hval::STYLE . + $ctx->{www}->style($upfx) . "". $top . $tip; } +sub code_footer ($) { + my ($env) = @_; + my $u = PublicInbox::Hval::prurl($env, $CODE_URL); + qq(AGPL code for this site: git clone $u $PROJECT) +} + 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); - foreach my $u (@{$obj->cloneurl}) { + my $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->description); + + my (%seen, @urls); + my $http = $ibx->base_url($ctx->{env}); + chop $http; # no trailing slash for clone + my $max = $ibx->max_git_epoch; + my $dir = (split(m!/!, $http))[-1]; + if (defined($max)) { # v2 + $seen{$http} = 1; + for my $i (0..$max) { + # 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: 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}; $seen{$u} = 1; push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; } - if (scalar(@urls) == 1) { - $urls .= " git clone --mirror $http"; - } else { + + if (defined($max) || scalar(@urls) > 1) { $urls .= "\n" . join("\n", map { "\tgit clone --mirror $_" } @urls); + } else { + $urls .= " git clone --mirror $urls[0]"; } + if (defined $max) { + my $addrs = $ibx->{address}; + $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY'; + $urls .= <$_) } @{$obj->nntp_url}; + # If you have public-inbox 1.1+ installed, you may + # initialize and index your mirror using the following commands: + public-inbox-init -V2 $ibx->{name} $dir/ $http \\ + $addrs + public-inbox-index $dir +EOF + } else { # v1 + $urls .= "\n"; + } + + my $cfg_link = ($ctx->{-upfx} // '').'_/text/config/raw'; + $urls .= qq(\nExample config snippet for mirrors\n); + my @nntp = map { qq($_) } @{$ibx->nntp_url}; if (@nntp) { - $urls .= "\n\n"; + $urls .= "\n"; $urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are'; $urls .= ' available over NNTP:'; $urls .= "\n\t" . join("\n\t", @nntp) . "\n"; @@ -97,28 +143,23 @@ sub _html_end { 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,
-		'AGPL code for this site: '.
-		qq(git clone $url $PROJECT)
+		code_footer($ctx->{env})
 	).'

'; } +# 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;