about summary refs log tree commit homepage
path: root/lib/PublicInbox/Import.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-08-15 01:54:51 +0000
committerEric Wong <e@80x24.org>2016-08-15 01:56:48 +0000
commit5cbb8df04448baf6c07c3de652d287bd2a0a3299 (patch)
treede6abef0f48a9e2b01408a924345c7178b34f82c /lib/PublicInbox/Import.pm
parent066509e117ab359d338e50cdd3ccec5601581d7c (diff)
downloadpublic-inbox-5cbb8df04448baf6c07c3de652d287bd2a0a3299.tar.gz
Not sure why or how I missed this before; but the common address
parsing routine we have should be more correct.

Add a test to ensure excessively quoted names don't make it
through, either.
Diffstat (limited to 'lib/PublicInbox/Import.pm')
-rw-r--r--lib/PublicInbox/Import.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 9555d27c..c2beb19c 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -10,6 +10,7 @@ use warnings;
 use Fcntl qw(:flock :DEFAULT);
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::MID qw(mid_mime mid2path);
+use PublicInbox::Address;
 
 sub new {
         my ($class, $git, $name, $email, $inbox) = @_;
@@ -145,14 +146,13 @@ sub add {
         my ($self, $mime, $check_cb) = @_; # mime = Email::MIME
 
         my $from = $mime->header('From');
-        my ($email) = ($from =~ /([^<\s]+\@[^>\s]+)/g);
-        my $name = $from;
-        $name =~ s/\s*\S+\@\S+\s*\z//;
+        my ($email) = PublicInbox::Address::emails($from);
+        my ($name) = PublicInbox::Address::names($from);
         # git gets confused with:
         #  "'A U Thor <u@example.com>' via foo" <foo@example.com>
         # ref:
         # <CAD0k6qSUYANxbjjbE4jTW4EeVwOYgBD=bXkSu=akiYC_CB7Ffw@mail.gmail.com>
-        $name =~ tr/<>// and $name = $email;
+        $name =~ tr/<>//d;
 
         my $date = $mime->header('Date');
         my $subject = $mime->header('Subject');