]> Sergey Matveev's repositories - public-inbox.git/blobdiff - lib/PublicInbox/Address.pm
address: use comment as name if no phrase available
[public-inbox.git] / lib / PublicInbox / Address.pm
index 46aa0da7f9db085a1adb1f13b83b0b74455cd14d..a58d1efff9e38ea9071c9d96e4a4bec0d664e9d7 100644 (file)
@@ -13,16 +13,26 @@ sub emails {
 }
 
 sub names {
-       map {
-               tr/\r\n\t/ /;
-               s/\s*<([^<]+)\z//;
-               my $e = $1;
-               s/\A['"\s]*//;
-               s/['"\s]*\z//;
-               $e = $_ =~ /\S/ ? $_ : $e;
-               $e =~ s/\@\S+\z//;
-               $e;
-       } split(/\@+[\w\.\-]+>?\s*(?:\(.*?\))?(?:,\s*|\z)/, $_[0]);
+       my @p = split(/<?([^@<>]+)\@[\w\.\-]+>?\s*(\(.*?\))?(?:,\s*|\z)/,
+                       $_[0]);
+       my @ret;
+       for (my $i = 0; $i <= $#p;) {
+               my $phrase = $p[$i++];
+               $phrase =~ tr/\r\n\t / /s;
+               $phrase =~ s/\A['"\s]*//;
+               $phrase =~ s/['"\s]*\z//;
+               my $user = $p[$i++] // '';
+               my $comment = $p[$i++] // '';
+               if ($phrase =~ /\S/) {
+                       $phrase =~ s/\@\S+\z//;
+                       push @ret, $phrase;
+               } elsif ($comment =~ /\A\((.*?)\)\z/) {
+                       push @ret, $1;
+               } else {
+                       push @ret, $user;
+               }
+       }
+       @ret;
 }
 
 1;