From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 1/3] inbox: altid_map becomes a method
Date: Thu, 26 Mar 2020 08:21:27 +0000 [thread overview]
Message-ID: <20200326082129.21699-2-e@yhbt.net> (raw)
In-Reply-To: <20200326082129.21699-1-e@yhbt.net>
We want to be able to preload that, as well as to access it
in WwwText for a config comment in the config example.
---
lib/PublicInbox/Inbox.pm | 15 +++++++++++++++
lib/PublicInbox/WWW.pm | 1 +
lib/PublicInbox/WwwAltId.pm | 14 +-------------
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 4f27d1bb..95ffd039 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -376,4 +376,19 @@ sub modified {
git($self)->modified; # v1
}
+# returns prefix => pathname mapping
+# (pathname is NOT public, but prefix is used for Xapian queries)
+sub altid_map ($) {
+ my ($self) = @_;
+ $self->{-altid_map} //= eval {
+ require PublicInbox::AltId;
+ my $altid = $self->{altid} or return {};
+ my %h = map {;
+ my $x = PublicInbox::AltId->new($self, $_);
+ "$x->{prefix}" => $x->{filename}
+ } @$altid;
+ \%h;
+ } // {};
+}
+
1;
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 5017f572..56d2c42a 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -170,6 +170,7 @@ sub preload {
sub preload_inbox {
my $ibx = shift;
+ $ibx->altid_map;
$ibx->cloneurl;
$ibx->description;
$ibx->base_url;
diff --git a/lib/PublicInbox/WwwAltId.pm b/lib/PublicInbox/WwwAltId.pm
index 34641a92..a45d8061 100644
--- a/lib/PublicInbox/WwwAltId.pm
+++ b/lib/PublicInbox/WwwAltId.pm
@@ -10,18 +10,6 @@ use PublicInbox::AltId;
use PublicInbox::Spawn qw(which);
our $sqlite3 = $ENV{SQLITE3};
-# returns prefix => pathname mapping
-# (pathname is NOT public, but prefix is used for Xapian queries)
-sub altid_map ($) {
- my ($ibx) = @_;
- my $altid = $ibx->{altid} or return {};
- my %h = map {;
- my $x = PublicInbox::AltId->new($ibx, $_);
- "$x->{prefix}" => $x->{filename}
- } @$altid;
- \%h;
-}
-
sub sqlite3_missing ($) {
PublicInbox::WwwResponse::oneshot($_[0], 501, \<<EOF);
<pre>sqlite3 not available
@@ -51,7 +39,7 @@ sub check_output {
sub sqldump ($$) {
my ($ctx, $altid_pfx) = @_;
my $ibx = $ctx->{-inbox};
- my $altid_map = $ibx->{-altid_map} //= altid_map($ibx);
+ my $altid_map = $ibx->altid_map;
my $fn = $altid_map->{$altid_pfx};
unless (defined $fn) {
return PublicInbox::WwwStream::oneshot($ctx, 404, \<<EOF);
next prev parent reply other threads:[~2020-03-26 8:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 8:21 [PATCH 0/3] wwwaltid: add pointers for usability Eric Wong
2020-03-26 8:21 ` Eric Wong [this message]
2020-03-26 8:21 ` [PATCH 2/3] wwwtext: show altid instructions in config Eric Wong
2020-03-26 8:21 ` [PATCH 3/3] wwwaltid: inform users to use POST instead of GET Eric Wong
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=20200326082129.21699-2-e@yhbt.net \
--to=e@yhbt.net \
--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.
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).