inbox: altid_map becomes a method

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index b76d4e5abb017383f831af4a97c73903e7cfa80a..95ffd039fdb7390b359c66bd30be6080d280e7cc 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Represents a public-inbox (which may have multiple mailing addresses)
@@ -219,25 +219,19 @@ sub try_cat {
 
 sub description {
        my ($self) = @_;
-       my $desc = $self->{description};
-       return $desc if defined $desc;
-       $desc = try_cat("$self->{inboxdir}/description");
-       local $/ = "\n";
-       chomp $desc;
-       $desc =~ s/\s+/ /smg;
-       $desc = '($INBOX_DIR/description missing)' if $desc eq '';
-       $self->{description} = $desc;
+       $self->{description} //= do {
+               my $desc = try_cat("$self->{inboxdir}/description");
+               local $/ = "\n";
+               chomp $desc;
+               $desc =~ s/\s+/ /smg;
+               $desc eq '' ? '($INBOX_DIR/description missing)' : $desc;
+       };
 }
 
 sub cloneurl {
        my ($self) = @_;
-       my $url = $self->{cloneurl};
-       return $url if $url;
-       $url = try_cat("$self->{inboxdir}/cloneurl");
-       my @url = split(/\s+/s, $url);
-       local $/ = "\n";
-       chomp @url;
-       $self->{cloneurl} = \@url;
+       $self->{cloneurl} //=
+               [ split(/\s+/s, try_cat("$self->{inboxdir}/cloneurl")) ];
 }
 
 sub base_url {
@@ -311,9 +305,9 @@ sub nntp_usable {
        $ret;
 }
 
+# for v1 users w/o SQLite only
 sub msg_by_path ($$;$) {
        my ($self, $path, $ref) = @_;
-       # TODO: allow other refs:
        my $str = git($self)->cat_file('HEAD:'.$path, $ref);
        $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
        $str;
@@ -352,7 +346,7 @@ sub smsg_by_mid ($$) {
        # favor the Message-ID we used for the NNTP article number:
        defined(my $num = mid2num($self, $mid)) or return;
        my $smsg = $over->get_art($num) or return;
-       PublicInbox::SearchMsg::psgi_cull($smsg);
+       PublicInbox::Smsg::psgi_cull($smsg);
 }
 
 sub msg_by_mid ($$;$) {
@@ -382,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;