X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=a4ba1fff6a35d298818e4d6981477f27e99bd56d;hb=c3d8c3df9f91aead9f6c24e1402b24e02c6a6def;hp=6696cc35d4d1e24e402ab6ad49f03275a0761333;hpb=3c39f9c942a6975245fda878e9b957d8d3367662;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 6696cc35..a4ba1fff 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -9,10 +9,9 @@ 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 {} @@ -24,7 +23,7 @@ sub new { chop $base_url; # no trailing slash for clone bless { nr => 0, - cb => $cb || *close, + cb => $cb || \&close, ctx => $ctx, base_url => $base_url, }, $class; @@ -41,25 +40,20 @@ sub _html_top ($) { 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 = "$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"); - } 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{
$top} .
 			  qq{\n} .
@@ -71,16 +65,16 @@ sub _html_top ($) {
 		$top = '
' . $top . "\n" . $links . '
'; } "$title" . - "" . + qq() . $ctx->{www}->style($upfx) . - "". $top . $tip; + ''. $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 $u $PROJECT) + my $u = prurl($env, $CODE_URL); + qq(AGPL code for this site: git clone $u) } sub _html_end { @@ -90,12 +84,12 @@ 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; @@ -104,15 +98,13 @@ sub _html_end { 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($u) : $u; }