isearch: emulate per-inbox search with ->ALL

[public-inbox.git] / lib / PublicInbox / WwwText.pm

diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 508005fba0ee315b603dd0fb2b365a14d318c092..8cc818df26279e800c054f990666c5b788169720 100644 (file)
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -11,7 +11,6 @@ use PublicInbox::WwwStream;
 use PublicInbox::Hval qw(ascii_html);
 use URI::Escape qw(uri_escape_utf8);
 use PublicInbox::GzipFilter qw(gzf_maybe);
-use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
 our $QP_URL = 'https://xapian.org/docs/queryparser.html';
 our $WIKI_URL = 'https://en.wikipedia.org/wiki';
 my $hl = eval {
@@ -39,16 +38,13 @@ sub get_text {
        }
        my $env = $ctx->{env};
        if ($raw) {
-               my $body;
-               if (my $gzf = $code == 200 ? gzf_maybe($hdr, $env) : undef) {
-                       my $zbuf = $gzf->translate($txt);
-                       undef $txt;
-                       $body = [ $zbuf .= $gzf->translate(undef) ];
-               } else {
-                       $body = [ $txt ];
+               if ($code == 200) {
+                       my $gzf = gzf_maybe($hdr, $env);
+                       $txt = $gzf->translate($txt);
+                       $txt .= $gzf->zflush;
                }
-               $hdr->[3] = bytes::length($body->[0]);
-               return [ $code, $hdr, $body ]
+               $hdr->[3] = bytes::length($txt);
+               return [ $code, $hdr, [ $txt ] ]
        }
 
        # enforce trailing slash for "wget -r" compatibility
@@ -64,25 +60,18 @@ sub get_text {
        # Follow git commit message conventions,
        # first line is the Subject/title
        my ($title) = ($txt =~ /\A([^\n]*)/s);
-       $ctx->{txt} = \$txt;
        $ctx->{-title_html} = ascii_html($title);
        my $nslash = ($key =~ tr!/!/!);
        $ctx->{-upfx} = '../../../' . ('../' x $nslash);
-       PublicInbox::WwwStream->response($ctx, $code, \&_do_linkify);
-}
-
-sub _do_linkify {
-       my ($nr, $ctx) = @_;
-       return unless $nr == 1;
        my $l = PublicInbox::Linkify->new;
-       my $txt = delete $ctx->{txt};
-       $l->linkify_1($$txt);
+       $l->linkify_1($txt);
        if ($hl) {
-               $hl->do_hl_text($txt);
+               $hl->do_hl_text(\$txt);
        } else {
-               $$txt = ascii_html($$txt);
+               $txt = ascii_html($txt);
        }
-       '<pre>' . $l->linkify_2($$txt) . '</pre>';
+       $txt = '<pre>' . $l->linkify_2($txt) . '</pre>';
+       PublicInbox::WwwStream::html_oneshot($ctx, $code, \$txt);
 }
 
 sub _srch_prefix ($$) {
@@ -150,14 +139,16 @@ sub inbox_config ($$$) {
        push @$hdr, 'Content-Disposition', 'inline; filename=inbox.config';
        my $name = dq_escape($ibx->{name});
        my $inboxdir = '/path/to/top-level-inbox';
+       my $base_url = $ibx->base_url($ctx->{env});
        $$txt .= <<EOS;
-; example public-inbox config snippet for "$name"
-; see public-inbox-config(5) manpage for more details:
+; Example public-inbox config snippet for a mirror of
+; $base_url
+; See public-inbox-config(5) manpage for more details:
 ; https://public-inbox.org/public-inbox-config.html
 [publicinbox "$name"]
        inboxdir = $inboxdir
-       ; note: public-inbox before v1.2.0 used "mainrepo"
-       ; instead of "inboxdir", both remain supported after 1.2
+       ; note: public-inbox before v1.2.0 used `mainrepo' instead of
+       ; `inboxdir', both remain supported after 1.2
        mainrepo = $inboxdir
        url = https://example.com/$name/
        url = http://example.onion/$name/
@@ -167,7 +158,6 @@ EOS
                $$txt .= "\t$k = $_\n" for @$v;
        }
        if (my $altid = $ibx->{altid}) {
-               my $base_url = $ibx->base_url($ctx->{env});
                my $altid_map = $ibx->altid_map;
                $$txt .= <<EOF;
        ; altid DBs may be used to provide numeric article ID lookup from
@@ -192,7 +182,13 @@ EOF
        # and drop the original structure
        if (defined(my $cr = $ibx->{coderepo})) {
                $$txt .= "\tcoderepo = $_\n" for @$cr;
+               $$txt .= <<'EOF';
 
+; `coderepo' entries allows blob reconstruction via patch emails if
+; the inbox is indexed with Xapian.  `@@ <from-range> <to-range> @@'
+; line number ranges in `[PATCH]' emails link to /$INBOX_NAME/$OID/s/,
+; an HTTP endpoint which reconstructs git blobs via git-apply(1).
+EOF
                my $pi_config = $ctx->{www}->{pi_config};
                for my $cr_name (@$cr) {
                        my $urls = $pi_config->{"coderepo.$cr_name.cgiturl"};
@@ -203,11 +199,11 @@ EOF
                        if ($urls && scalar(@$urls)) {
                                $$txt .= "\t; ";
                                $$txt .= join(" ||\n\t;\t", map {;
-                                       my $cpath = $path;
+                                       my $dst = $path;
                                        if ($path !~ m![a-z0-9_/\.\-]!i) {
-                                               $cpath = dq_escape($cpath);
+                                               $dst = '"'.dq_escape($dst).'"';
                                        }
-                                       qq(git clone $_ "$cpath");
+                                       qq(git clone $_ $dst);
                                } @$urls);
                                $$txt .= "\n";
                        }
@@ -254,7 +250,7 @@ EOF
 
        # n.b. we use the Xapian DB for any regeneratable,
        # order-of-arrival-independent data.
-       my $srch = $ibx->search;
+       my $srch = $ibx->isrch;
        if ($srch) {
                $$txt .= <<EOF;
 search
@@ -342,6 +338,7 @@ contact
 
     This help text is maintained by public-inbox developers
     reachable via plain-text email at: meta\@public-inbox.org
+    Their inbox is archived at: https://public-inbox.org/meta/
 
 EOF
        # TODO: support admin contact info in ~/.public-inbox/config