remove Email::Address dependency

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

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 1afcf5d252407adc8d9189a9a4bb9f06bc24978b..e3d65f4aa73b8eb28fa3e9024361c057e2284b9c 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -8,7 +8,6 @@ package PublicInbox::Import;
 use strict;
 use warnings;
 use Fcntl qw(:flock :DEFAULT);
-use Email::Address;
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::MID qw(mid_mime mid2path);
 
@@ -141,21 +140,21 @@ sub add {
        my ($self, $mime) = @_; # mime = Email::MIME
 
        my $from = $mime->header('From');
-       my @from = Email::Address->parse($from);
-       my $name = $from[0]->name;
-       my $email = $from[0]->address;
-       my $date = $mime->header('Date');
-       my $subject = $mime->header('Subject');
-       $subject = '(no subject)' unless defined $subject;
-       my $mid = mid_mime($mime);
-       my $path = mid2path($mid);
-
+       my ($email) = ($from =~ /([^<\s]+\@[^>\s]+)/g);
+       my $name = $from;
+       $name =~ s/\s*\S+\@\S+\s*\z//;
        # 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;
 
+       my $date = $mime->header('Date');
+       my $subject = $mime->header('Subject');
+       $subject = '(no subject)' unless defined $subject;
+       my $mid = mid_mime($mime);
+       my $path = mid2path($mid);
+
        my ($r, $w) = $self->gfi_start;
        my $tip = $self->{tip};
        if ($tip ne '') {