$title

X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=6696cc35d4d1e24e402ab6ad49f03275a0761333;hp=e548f00f4a3ed024a9da56263860617b2638e60f;hb=3c39f9c942a6975245fda878e9b957d8d3367662;hpb=a9cab9c477b74b3b828c26aa64e70d88c9d6744c diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index e548f00f..6696cc35 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2018 all contributors +# Copyright (C) 2016-2019 all contributors # License: AGPL-3.0+ # # HTML body stream for which yields getline+close methods @@ -10,9 +10,7 @@ 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'; @@ -21,7 +19,15 @@ sub close {} sub new { my ($class, $ctx, $cb) = @_; - bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class; + + my $base_url = $ctx->{-inbox}->base_url($ctx->{env}); + chop $base_url; # no trailing slash for clone + bless { + nr => 0, + cb => $cb || *close, + ctx => $ctx, + base_url => $base_url, + }, $class; } sub response { @@ -33,17 +39,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"); @@ -65,27 +73,32 @@ 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 $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->description); my (%seen, @urls); - my $http = $obj->base_url($ctx->{env}); - chop $http; # no trailing slash for clone - my $part = $obj->max_git_part; + my $http = $self->{base_url}; + my $max = $ibx->max_git_epoch; my $dir = (split(m!/!, $http))[-1]; - if (defined($part)) { # v2 + if (defined($max)) { # v2 $seen{$http} = 1; - for my $i (0..$part) { + for my $i (0..$max) { # old parts my be deleted: - -d "$obj->{mainrepo}/git/$i.git" or next; + -d "$ibx->{inboxdir}/git/$i.git" or next; my $url = "$http/$i"; $seen{$url} = 1; push @urls, "$url $dir/git/$i.git"; @@ -95,36 +108,41 @@ sub _html_end { push @urls, $http; } - # FIXME: partitioning in can be different in other repositories, + # FIXME: epoch splits can be different in other repositories, # use the "cloneurl" file as-is for now: - foreach my $u (@{$obj->cloneurl}) { + foreach my $u (@{$ibx->cloneurl}) { next if $seen{$u}; $seen{$u} = 1; push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; } - if (defined($part) || scalar(@urls) > 1) { + if (defined($max) || scalar(@urls) > 1) { $urls .= "\n" . join("\n", map { "\tgit clone --mirror $_" } @urls); } else { $urls .= " git clone --mirror $urls[0]"; } - if (defined $part) { - my $addrs = $obj->{address}; + if (defined $max) { + my $addrs = $ibx->{address}; $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY'; $urls .= <{name} $dir/ $http \\ + public-inbox-init -V2 $ibx->{name} $dir/ $http \\ $addrs public-inbox-index $dir EOF + } else { # v1 + $urls .= "\n"; } - my @nntp = map { qq($_) } @{$obj->nntp_url}; + + 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"; @@ -132,17 +150,11 @@ EOF 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})
 	).'

'; }