X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=186eb420255e481c8adc5a3faea0d98c433f1ac5;hb=0c586dc64b3b6642a894e125d09df446667a4079;hp=ff80096528eb2301aae63c9389dba01421051868;hpb=cb1c874520153f5c28a932959446977062c7db69;p=public-inbox.git

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index ff800965..186eb420 100644
--- 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)
@@ -52,7 +52,7 @@ sub cleanup_task () {
 sub cleanup_possible () {
 	# no need to require DS, here, if it were enabled another
 	# module would've require'd it, already
-	eval { $PublicInbox::DS::in_loop } or return 0;
+	eval { PublicInbox::DS::in_loop() } or return 0;
 
 	eval {
 		require Devel::Peek; # needs separate package in Fedora
@@ -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;
@@ -125,10 +125,12 @@ sub new {
 	bless $opts, $class;
 }
 
+sub version { $_[0]->{version} // 1 }
+
 sub git_epoch {
 	my ($self, $epoch) = @_;
-	($self->{version} || 1) == 2 or return;
-	$self->{"$epoch.git"} ||= eval {
+	$self->version == 2 or return;
+	$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};
@@ -139,9 +141,9 @@ 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} || 1) == 2);
+		$git_dir .= '/all.git' if $self->version == 2;
 		my $g = PublicInbox::Git->new($git_dir);
 		$g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
 		_cleanup_later($self);
@@ -151,8 +153,7 @@ sub git {
 
 sub max_git_epoch {
 	my ($self) = @_;
-	my $v = $self->{version};
-	return unless defined($v) && $v == 2;
+	return if $self->version < 2;
 	my $cur = $self->{-max_git_epoch};
 	my $changed = git($self)->alternates_changed;
 	if (!defined($cur) || $changed) {
@@ -178,7 +179,7 @@ sub mm {
 		require PublicInbox::Msgmap;
 		_cleanup_later($self);
 		my $dir = $self->{inboxdir};
-		if (($self->{version} || 1) >= 2) {
+		if ($self->version >= 2) {
 			PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
 		} else {
 			PublicInbox::Msgmap->new($dir);
@@ -218,25 +219,22 @@ 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 '' ? undef : $desc;
+	}) // '($INBOX_DIR/description missing)';
 }
 
 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} //= do {
+		my $s = try_cat("$self->{inboxdir}/cloneurl");
+		my @urls = split(/\s+/s, $s);
+		scalar(@urls) ? \@urls : undef
+	}) // [];
 }
 
 sub base_url {
@@ -293,12 +291,11 @@ sub nntp_url {
 				# nntp://news.example.com/alt.example
 				push @m, $u;
 			}
-			my %seen = map { $_ => 1 } @urls;
-			foreach my $u (@m) {
-				next if $seen{$u};
-				$seen{$u} = 1;
-				push @urls, $u;
-			}
+
+			# List::Util::uniq requires Perl 5.26+, maybe we
+			# can use it by 2030 or so
+			my %seen;
+			@urls = grep { !$seen{$_}++ } (@urls, @m);
 		}
 		\@urls;
 	};
@@ -311,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 ($$;$) {
@@ -327,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 {
@@ -352,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 ($$;$) {
@@ -382,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;