-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# HTML body stream for which yields getline+close methods
package PublicInbox::WwwStream;
use strict;
use warnings;
-use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::Hval qw(ascii_html prurl);
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';
# noop for HTTP.pm (and any other PSGI servers)
sub close {}
chop $base_url; # no trailing slash for clone
bless {
nr => 0,
- cb => $cb || *close,
+ cb => $cb || \&close,
ctx => $ctx,
base_url => $base_url,
}, $class;
my $ctx = $self->{ctx};
my $ibx = $ctx->{-inbox};
my $desc = ascii_html($ibx->description);
- my $title = $ctx->{-title_html} || $desc;
+ 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 = "<b>$desc</b>";
my $links = "<a\nhref=\"$help\">help</a> / ".
"<a\nhref=\"$color\">color</a> / ".
"<a\nhref=\"$atom\">Atom feed</a>";
if ($ibx->search) {
- my $q_val = $ctx->{-q_value_html};
- if (defined $q_val && $q_val ne '') {
- $q_val = qq(\nvalue="$q_val");
- } else {
- $q_val = '';
- }
+ 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{<form\naction="$action"><pre>$top} .
qq{\n<input\nname=q\ntype=text$q_val />} .
$top = '<pre>' . $top . "\n" . $links . '</pre>';
}
"<html><head><title>$title</title>" .
- "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
- "href=\"$atom\"\ntype=\"application/atom+xml\"/>" .
+ qq(<link\nrel=alternate\ntitle="Atom feed"\n).
+ qq(href="$atom"\ntype="application/atom+xml"/>) .
$ctx->{www}->style($upfx) .
- "</head><body>". $top . $tip;
+ '</head><body>'. $top . (delete($ctx->{-html_tip}) // '');
}
sub code_footer ($) {
my ($env) = @_;
- my $u = PublicInbox::Hval::prurl($env, $CODE_URL);
- qq(AGPL code for this site: git clone <a\nhref="$u">$u</a> $PROJECT)
+ my $u = prurl($env, $CODE_URL);
+ qq(AGPL code for this site: git clone <a\nhref="$u">$u</a>)
}
sub _html_end {
my $ibx = $ctx->{-inbox};
my $desc = ascii_html($ibx->description);
- my (%seen, @urls);
+ my @urls;
my $http = $self->{base_url};
my $max = $ibx->max_git_epoch;
my $dir = (split(m!/!, $http))[-1];
+ my %seen = ($http => 1);
if (defined($max)) { # v2
- $seen{$http} = 1;
for my $i (0..$max) {
# old parts my be deleted:
-d "$ibx->{inboxdir}/git/$i.git" or next;
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;
+ next if $seen{$u}++;
push @urls, $u =~ /\Ahttps?:/ ? qq(<a\nhref="$u">$u</a>) : $u;
}