X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAddress.pm;h=f413c2f636b9af55dc815afda6936ceda5e05a28;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=772adedb29b3ed1546a647181a31609e5f3d7766;hpb=c70cc0c804f94127b7eb4448d796f4c1b3f6dd6f;p=public-inbox.git

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 772adedb..f413c2f6 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -1,26 +1,33 @@
-# Copyright (C) 2016 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>
 package PublicInbox::Address;
 use strict;
 use warnings;
 
-# very loose regexes, here.  We don't need RFC-compliance,
-# just enough to make thing sanely displayable and pass to git
+sub xs_emails {
+	grep { defined } map { $_->address() } parse_email_addresses($_[0])
+}
+
+sub xs_names {
+	grep { defined } map {
+		my $n = $_->name;
+		my $addr = $_->address;
+		$n = $_->user if defined($addr) && $n eq $addr;
+		$n;
+	} parse_email_addresses($_[0]);
+}
 
-sub emails { ($_[0] =~ /([^<\s,]+\@[^>\s,]+)/g) }
+eval {
+	require Email::Address::XS;
+	Email::Address::XS->import(qw(parse_email_addresses));
+	*emails = \&xs_emails;
+	*names = \&xs_names;
+};
 
-sub from_name {
-	my ($val) = @_;
-	my $name = $val;
-	$name =~ s/\s*\S+\@\S+\s*\z//;
-	if ($name !~ /\S/ || $name =~ /[<>]/) { # git does not like [<>]
-		($name) = emails($val);
-		$name =~ s/\@.*//;
-	}
-	$name =~ tr/\r\n\t/ /;
-	$name =~ s/\A['"\s]*//;
-	$name =~ s/['"\s]*\z//;
-	$name;
+if ($@) {
+	require PublicInbox::AddressPP;
+	*emails = \&PublicInbox::AddressPP::emails;
+	*names = \&PublicInbox::AddressPP::names;
 }
 
 1;