address: beef up the module with name list extaction

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

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index ef4cbdc62bd15057bf135f8aad15f6a0228a4de1..abba43d1f03ef25d032ee31abf07a78767d40e97 100644 (file)
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -7,7 +7,18 @@ use warnings;
 # very loose regexes, here.  We don't need RFC-compliance,
 # just enough to make thing sanely displayable and pass to git
 
-sub emails { ($_[0] =~ /([^<\s]+\@[^>\s]+)/g) }
+sub emails { ($_[0] =~ /([\w\.\+=\-]+\@[\w\.\-]+)>?\s*(?:,\s*|\z)/g) }
+
+sub names {
+       map {
+               tr/\r\n\t/ /;
+               s/\s*<([^<]+)\z//;
+               my $e = $1;
+               s/\A['"\s]*//;
+               s/['"\s]*\z//;
+               $_ =~ /\S/ ? $_ : $e;
+       } split(/\@+[\w\.\-]+>?\s*(?:,\s*|\z)/, $_[0]);
+}
 
 sub from_name {
        my ($val) = @_;
@@ -18,7 +29,8 @@ sub from_name {
                $name =~ s/\@.*//;
        }
        $name =~ tr/\r\n\t/ /;
-       $name =~ s/\A\s*//;
+       $name =~ s/\A['"\s]*//;
+       $name =~ s/['"\s]*\z//;
        $name;
 }