* [PATCH 4/8] www: avoid incorrect instructions for extindex
2021-08-26 12:33 7% ` [PATCH 0/8] various WWW + extindex stuff Eric Wong
@ 2021-08-26 12:33 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-08-26 12:33 UTC (permalink / raw)
To: meta
There's no way to clone an extindex, since there's no git
storage associated with them. So attempt to link to the
HTML listing of public-inboxes, instead.
---
lib/PublicInbox/ExtSearch.pm | 4 --
lib/PublicInbox/WwwStream.pm | 111 +++++++++++++++++++----------------
2 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm
index 0b480c7e..bd301158 100644
--- a/lib/PublicInbox/ExtSearch.pm
+++ b/lib/PublicInbox/ExtSearch.pm
@@ -106,10 +106,6 @@ sub description {
'$EXTINDEX_DIR/description missing';
}
-sub cloneurl { [] } # TODO
-
-sub nntp_url { [] }
-
no warnings 'once';
*base_url = \&PublicInbox::Inbox::base_url;
*smsg_eml = \&PublicInbox::Inbox::smsg_eml;
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 57c23690..d8142824 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -120,52 +120,50 @@ sub code_footer ($) {
sub _html_end {
my ($ctx) = @_;
- my $urls = <<EOF;
-<a
-id=mirror>This inbox may be cloned and mirrored by anyone:</a>
-EOF
-
my $ibx = $ctx->{ibx};
my $desc = ascii_html($ibx->description);
-
- my @urls;
+ my $s = "<a\nid=mirror>";
my $http = $ctx->{base_url};
- my $max = $ibx->max_git_epoch;
my $dir = (split(m!/!, $http))[-1];
my %seen = ($http => 1);
- # TODO: some of these URLs may be too long and we may need to
- # do something like code_footer() above, but these are local
- # admin-defined
- if (defined($max)) { # v2
- for my $i (0..$max) {
- # old epochs my be deleted:
- -d "$ibx->{inboxdir}/git/$i.git" or next;
- my $url = "$http/$i";
- $seen{$url} = 1;
- push @urls, "$url $dir/git/$i.git";
+ if ($ibx->can('cloneurl')) { # PublicInbox::Inbox
+ $s .= "This inbox may be cloned and mirrored by anyone:</a>\n";
+ my @urls;
+ my $max = $ibx->max_git_epoch;
+ # TODO: some of these URLs may be too long and we may need to
+ # do something like code_footer() above, but these are local
+ # admin-defined
+ if (defined($max)) { # v2
+ for my $i (0..$max) {
+ # old epochs my be deleted:
+ -d "$ibx->{inboxdir}/git/$i.git" or next;
+ my $url = "$http/$i";
+ $seen{$url} = 1;
+ push @urls, "$url $dir/git/$i.git";
+ }
+ my $nr = scalar(@urls);
+ if ($nr > 1) {
+ $s .= "\n\t";
+ $s .= "# this inbox consists of $nr epochs:";
+ $urls[0] .= "\t# oldest";
+ $urls[-1] .= "\t# newest";
+ }
+ } else { # v1
+ push @urls, $http;
}
- my $nr = scalar(@urls);
- if ($nr > 1) {
- $urls .= "\n\t# this inbox consists of $nr epochs:";
- $urls[0] .= "\t# oldest";
- $urls[-1] .= "\t# newest";
+ # FIXME: epoch splits can be different in other repositories,
+ # use the "cloneurl" file as-is for now:
+ for my $u (@{$ibx->cloneurl}) {
+ next if $seen{$u}++;
+ push @urls, ($u =~ /\Ahttps?:/ ?
+ qq(<a\nhref="$u">$u</a>) : $u);
}
- } else { # v1
- 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}++;
- push @urls, $u =~ /\Ahttps?:/ ? qq(<a\nhref="$u">$u</a>) : $u;
- }
-
- $urls .= "\n" . join('', map { "\tgit clone --mirror $_\n" } @urls);
- if (my $addrs = $ibx->{address}) {
- $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY';
- my $v = defined $max ? '-V2' : '-V1';
- $urls .= <<EOF;
+ $s .= "\n";
+ $s .= join('', map { "\tgit clone --mirror $_\n" } @urls);
+ if (my $addrs = $ibx->{address}) {
+ $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY';
+ my $v = defined $max ? '-V2' : '-V1';
+ $s .= <<EOF;
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
@@ -173,26 +171,41 @@ EOF
$addrs
public-inbox-index $dir
EOF
+ }
+ } else { # PublicInbox::ExtSearch
+ $s .= <<EOM;
+This is an extindex which is an amalgamation of several public-inboxes</a>
+EOM
+ my $v = $ctx->{www}->{pi_cfg}->{lc('publicInbox.wwwListing')};
+ if (($v // '') =~ /\A(?:all|match=domain)\z/) {
+ my $upfx = ($ctx->{-upfx} // ''). '../';
+ $s .= <<EOM;
+A list of them is available in the <a\nhref="$upfx">listing</a>
+EOM
+ }
}
+
my $cfg_link = ($ctx->{-upfx} // '').'_/text/config/raw';
- $urls .= <<EOF;
+ $s .= <<EOF;
Example <a
href="$cfg_link">config snippet</a> for mirrors.
EOF
- my @nntp = map { qq(<a\nhref="$_">$_</a>) } @{$ibx->nntp_url};
- if (@nntp) {
- $urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
- $urls .= ' available over NNTP:';
- $urls .= "\n\t" . join("\n\t", @nntp) . "\n";
+ if ($ibx->can('nntp_url')) {
+ my @nntp = map { qq(<a\nhref="$_">$_</a>) } @{$ibx->nntp_url};
+ if (@nntp) {
+ $s .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
+ $s .= ' available over NNTP:';
+ $s .= "\n\t" . join("\n\t", @nntp) . "\n";
+ }
}
- if ($urls =~ m!\b[^:]+://\w+\.onion/!) {
- $urls .= " note: .onion URLs require Tor: ";
- $urls .= qq[<a\nhref="$TOR_URL">$TOR_URL</a>];
+ if ($s =~ m!\b[^:]+://\w+\.onion/!) {
+ $s .= " note: .onion URLs require Tor: ";
+ $s .= qq[<a\nhref="$TOR_URL">$TOR_URL</a>];
}
'<hr><pre>'.join("\n\n",
$desc,
- $urls,
+ $s,
coderepos($ctx),
code_footer($ctx->{env})
).'</pre></body></html>';
^ permalink raw reply related [relevance 5%]
* [PATCH 0/8] various WWW + extindex stuff
@ 2021-08-26 12:33 7% ` Eric Wong
2021-08-26 12:33 5% ` [PATCH 4/8] www: avoid incorrect instructions for extindex Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-08-26 12:33 UTC (permalink / raw)
To: meta; +Cc: Konstantin Ryabitsev
This hopefully makes the long .onion URL more usable on small
displays; but I also got sidetracked into making our "use bytes"
stuff less scary based on the notice in the bytes(3perl)
manpage.
There's a couple of small extindex-related fixes to reconcile
the differences between the two ibxish object types for WWW.
Eric Wong (8):
get rid of unnecessary bytes::length usage
ds: use bytes::substr and bytes::length module-wide for now
www_stream: sh-friendly .onion URLs wrapping
www: avoid incorrect instructions for extindex
www_text: fix example config snippet for extindex
config: do not parse altid for extindex
www_text: add coderepo config support for extindex
move ->ids_after from mm to over
lib/PublicInbox/Config.pm | 2 +-
lib/PublicInbox/DS.pm | 21 +++---
lib/PublicInbox/ExtSearch.pm | 4 -
lib/PublicInbox/HTTP.pm | 17 ++---
lib/PublicInbox/ManifestJsGz.pm | 3 +-
lib/PublicInbox/Mbox.pm | 10 +--
lib/PublicInbox/Msgmap.pm | 11 ---
lib/PublicInbox/NNTP.pm | 4 +-
lib/PublicInbox/Over.pm | 11 +++
lib/PublicInbox/View.pm | 5 +-
lib/PublicInbox/ViewVCS.pm | 5 +-
lib/PublicInbox/WWW.pm | 10 +--
lib/PublicInbox/WwwAttach.pm | 4 +-
lib/PublicInbox/WwwHighlight.pm | 5 +-
lib/PublicInbox/WwwListing.pm | 4 +-
lib/PublicInbox/WwwStatic.pm | 4 +-
lib/PublicInbox/WwwStream.pm | 126 +++++++++++++++++++-------------
lib/PublicInbox/WwwText.pm | 103 ++++++++++++++++----------
t/extindex-psgi.t | 15 ++++
t/psgi_search.t | 1 -
t/search-thr-index.t | 8 +-
t/www_listing.t | 19 ++++-
xt/cmp-msgstr.t | 2 +-
23 files changed, 229 insertions(+), 165 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-08-16 16:36 RFE: Long .onion URL breaks mobile view Konstantin Ryabitsev
2021-08-26 12:33 7% ` [PATCH 0/8] various WWW + extindex stuff Eric Wong
2021-08-26 12:33 5% ` [PATCH 4/8] www: avoid incorrect instructions for extindex Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).