From 5cbb8df04448baf6c07c3de652d287bd2a0a3299 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 15 Aug 2016 01:54:51 +0000 Subject: import: use common address parsing to drop unnecessary quotes 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. --- lib/PublicInbox/Import.pm | 8 ++++---- t/address.t | 4 ++++ 2 files changed, 8 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 ' via foo" # ref: # - $name =~ tr/<>// and $name = $email; + $name =~ tr/<>//d; my $date = $mime->header('Date'); my $subject = $mime->header('Subject'); diff --git a/t/address.t b/t/address.t index 287fcfa0..be0fc5b7 100644 --- a/t/address.t +++ b/t/address.t @@ -29,4 +29,8 @@ is_deeply(['user'], \@names, 'address-as-name extraction works as expected'); is_deeply(\@emails, ['u@example.com'], 'backwards emails OK'); } + +@names = PublicInbox::Address::names('"Quote Unneeded" '); +is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped'); + done_testing; -- cgit v1.2.3-24-ge0c7