From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] www_listing: fix manifest.js.gz generation with extindex "all"
Date: Thu, 24 Jun 2021 12:59:09 +0000 [thread overview]
Message-ID: <20210624125909.10938-1-e@80x24.org> (raw)
WwwListing and ManifestJsGz may be too different nowadays to
be worth the code sharing between them.
Update some comments and note we still needs better tests :x
Fixes: 520be116e8a686cb ("www_listing: start updating for pagination + search")
---
lib/PublicInbox/ManifestJsGz.pm | 26 +++++++++++++++++++-------
lib/PublicInbox/WwwListing.pm | 3 ++-
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/ManifestJsGz.pm b/lib/PublicInbox/ManifestJsGz.pm
index e7bb0e86..9dc10791 100644
--- a/lib/PublicInbox/ManifestJsGz.pm
+++ b/lib/PublicInbox/ManifestJsGz.pm
@@ -13,12 +13,11 @@ use HTTP::Date qw(time2str);
my $json = PublicInbox::Config::json();
-# called by WwwListing
sub url_regexp {
my ($ctx) = @_;
# grokmirror uses relative paths, so it's domain-dependent
- # SUPER calls PublicInbox::WwwListing::url_regexp
- $ctx->SUPER::url_regexp('publicInbox.grokManifest', 'match=domain');
+ # SUPER calls PublicInbox::WwwListing::url_filter
+ ($ctx->url_filter('publicInbox.grokManifest', 'match=domain'))[0];
}
sub inject_entry ($$$;$) {
@@ -29,7 +28,7 @@ sub inject_entry ($$$;$) {
$ctx->{manifest}->{$url_path} = $ent;
}
-sub manifest_add ($$;$$) {
+sub manifest_add ($$;$$) { # slow path w/o extindex "all"
my ($ctx, $ibx, $epoch, $default_desc) = @_;
my $url_path = "/$ibx->{name}";
my $git;
@@ -70,20 +69,33 @@ sub eidx_manifest_add ($$$) {
}
}
+sub response {
+ my ($class, $ctx) = @_;
+ bless $ctx, $class;
+ my ($re, undef) = $ctx->url_filter;
+ $re // return psgi_triple($ctx);
+ my $iter = PublicInbox::ConfigIter->new($ctx->{www}->{pi_cfg},
+ $ctx->can('list_match_i'), $re, $ctx);
+ sub {
+ $ctx->{-wcb} = $_[0]; # HTTP server callback
+ $ctx->{env}->{'pi-httpd.async'} ?
+ $iter->event_step : $iter->each_section;
+ }
+}
+
sub ibx_entry {
my ($ctx, $ibx) = @_;
my $ALL = $ctx->{www}->{pi_cfg}->ALL;
- if ($ALL) {
+ if ($ALL) { # FIXME: test this in t/
eidx_manifest_add($ctx, $ALL, $ibx);
} else {
slow_manifest_add($ctx, $ibx);
+ warn "E: $@" if $@;
}
- warn "E: $@" if $@;
}
sub hide_key { 'manifest' } # for WwwListing->list_match_i
-# overrides WwwListing->psgi_triple
sub psgi_triple {
my ($ctx) = @_;
my $abs2urlpath = delete($ctx->{-abs2urlpath}) // {};
diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index eb015742..76c76663 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -90,7 +90,7 @@ sub add_misc_ibx { # MiscSearch->retry_reopen callback
$qs = "( $qs ) AND ( $user_query )";
}
my $mset = $misc->mset($qs, $opt); # sorts by $MODIFIED (mtime)
- $ctx->{-list} = [];
+ delete $ctx->{-list}; # reset if retried
my $pi_cfg = $ctx->{www}->{pi_cfg};
for my $mi ($mset->items) {
my $doc = $mi->get_document;
@@ -122,6 +122,7 @@ sub response {
my ($re, $qs) = $ctx->url_filter;
$re // return $ctx->psgi_triple;
if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) { # fast path
+ # FIXME: test this in t/
$ALL->misc->reopen->retry_reopen(\&add_misc_ibx,
$ctx, $re, $qs);
} else { # slow path, no [extindex "all"] configured
reply other threads:[~2021-06-24 12:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210624125909.10938-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).