From 33cef7f24d3ddedc4cd79ee88b0bba6ed1aab4c9 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 2 Jul 2016 21:50:28 +0000
Subject: config: introduce each_inbox for iteration

This fills in the internal lookup hashes and simplifies
callers.
---
 lib/PublicInbox/ExtMsg.pm | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'lib/PublicInbox/ExtMsg.pm')

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 4b9e025c..73bd4b17 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -30,19 +30,16 @@ sub ext_msg {
 
 	eval { require PublicInbox::Search };
 	my $have_xap = $@ ? 0 : 1;
-	my (@nox, @ibx);
+	my (@nox, @ibx, @found);
 
-	foreach my $k (keys %$pi_config) {
-		$k =~ /\Apublicinbox\.([A-Z0-9a-z-]+)\.url\z/ or next;
-		my $name = $1;
-		next if $name eq $cur->{name};
-		my $other = $pi_config->lookup_name($name) or next;
-		next unless $other->base_url;
+	$pi_config->each_inbox(sub {
+		my ($other) = @_;
+		return if $other->{name} eq $cur->{name} || !$other->base_url;
 
 		my $s = $other->search;
 		if (!$s) {
 			push @nox, $other;
-			next;
+			return;
 		}
 
 		# try to find the URL with Xapian to avoid forking
@@ -50,17 +47,22 @@ sub ext_msg {
 		if ($@) {
 			# xapian not configured properly for this repo
 			push @nox, $other;
-			next;
+			return;
 		}
 
 		# maybe we found it!
-		return r302($other, $mid) if defined $doc_id;
+		if (defined $doc_id) {
+			push @found, $other;
+		} else {
+			# no point in trying the fork fallback if we
+			# know Xapian is up-to-date but missing the
+			# message in the current repo
+			push @ibx, $other;
+		}
+	});
 
-		# no point in trying the fork fallback if we
-		# know Xapian is up-to-date but missing the
-		# message in the current repo
-		push @ibx, $other;
-	}
+	# TODO: multiple hits
+	return r302($found[0], $mid) if @found;
 
 	# Xapian not installed or configured for some repos,
 	# do a full MID check:
-- 
cgit v1.2.3-24-ge0c7