reduce scope of mbox From_ line removal

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index accfd97472ed30be40685ee8724918b39bba9dd7..186eb420255e481c8adc5a3faea0d98c433f1ac5 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)
@@ -82,7 +82,7 @@ sub _set_uint ($$$) {
 sub _set_limiter ($$$) {
        my ($self, $pi_config, $pfx) = @_;
        my $lkey = "-${pfx}_limiter";
-       $self->{$lkey} ||= eval {
+       $self->{$lkey} ||= do {
                # full key is: publicinbox.$NAME.httpbackendmax
                my $mkey = $pfx.'max';
                my $val = $self->{$mkey} or return;
@@ -130,7 +130,7 @@ sub version { $_[0]->{version} // 1 }
 sub git_epoch {
        my ($self, $epoch) = @_;
        $self->version == 2 or return;
-       $self->{"$epoch.git"} ||= eval {
+       $self->{"$epoch.git"} ||= do {
                my $git_dir = "$self->{inboxdir}/git/$epoch.git";
                my $g = PublicInbox::Git->new($git_dir);
                $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
@@ -141,7 +141,7 @@ sub git_epoch {
 
 sub git {
        my ($self) = @_;
-       $self->{git} ||= eval {
+       $self->{git} ||= do {
                my $git_dir = $self->{inboxdir};
                $git_dir .= '/all.git' if $self->version == 2;
                my $g = PublicInbox::Git->new($git_dir);
@@ -219,19 +219,22 @@ sub try_cat {
 
 sub description {
        my ($self) = @_;
-       $self->{description} //= do {
+       ($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;
-       };
+               $desc eq '' ? undef : $desc;
+       }) // '($INBOX_DIR/description missing)';
 }
 
 sub cloneurl {
        my ($self) = @_;
-       $self->{cloneurl} //=
-               [ split(/\s+/s, try_cat("$self->{inboxdir}/cloneurl")) ];
+       ($self->{cloneurl} //= do {
+               my $s = try_cat("$self->{inboxdir}/cloneurl");
+               my @urls = split(/\s+/s, $s);
+               scalar(@urls) ? \@urls : undef
+       }) // [];
 }
 
 sub base_url {
@@ -305,12 +308,10 @@ 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;
+       git($self)->cat_file('HEAD:'.$path, $ref);
 }
 
 sub msg_by_smsg ($$;$) {
@@ -321,9 +322,7 @@ sub msg_by_smsg ($$;$) {
        return unless defined $smsg;
        defined(my $blob = $smsg->{blob}) or return;
 
-       my $str = git($self)->cat_file($blob, $ref);
-       $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
-       $str;
+       git($self)->cat_file($blob, $ref);
 }
 
 sub smsg_mime {
@@ -346,7 +345,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 ($$;$) {
@@ -376,4 +375,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;