diff options
Diffstat (limited to 'lib/PublicInbox/Import.pm')
| -rw-r--r-- | lib/PublicInbox/Import.pm | 8 |
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'); |