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) = @_;
+ my ($class, $git, $name, $email, $inbox) = @_;
bless {
git => $git,
ident => "$name <$email>",
mark => 1,
ref => 'refs/heads/master',
+ inbox => $inbox,
}, $class
}
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');
eval {
require PublicInbox::SearchIdx;
- PublicInbox::SearchIdx->new($git_dir, 2)->index_sync;
+ my $inbox = $self->{inbox} || $git_dir;
+ my $s = PublicInbox::SearchIdx->new($inbox);
+ $s->index_sync({ ref => $self->{ref} });
};
}