X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=082e5ec9caf3b3466efe96ae0439d81a05a4a4db;hb=c477bdd8a80eecc319b680764edfb24bd12cb7b2;hp=e548f00f4a3ed024a9da56263860617b2638e60f;hpb=a9cab9c477b74b3b828c26aa64e70d88c9d6744c;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index e548f00f..082e5ec9 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -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';
@@ -33,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");
@@ -65,27 +65,33 @@ 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});
+ my $http = $ibx->base_url($ctx->{env});
chop $http; # no trailing slash for clone
- my $part = $obj->max_git_part;
+ 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->{mainrepo}/git/$i.git" or next;
my $url = "$http/$i";
$seen{$url} = 1;
push @urls, "$url $dir/git/$i.git";
@@ -95,34 +101,34 @@ 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
}
- my @nntp = map { qq($_) } @{$obj->nntp_url};
+ my @nntp = map { qq($_) } @{$ibx->nntp_url};
if (@nntp) {
$urls .= "\n\n";
$urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
@@ -132,17 +138,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})
).'
';
}