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
}
# wait for other processes to be done
flock($lockfh, LOCK_EX) or die "lock failed: $!\n";
+ local $/ = "\n";
chomp($self->{tip} = $git->qx(qw(rev-parse --revs-only), $self->{ref}));
my @cmd = ('git', "--git-dir=$git_dir", qw(fast-import
defined($n) or die "read final byte of cat-blob failed: $!";
die "bad read on final byte: <$lf>" if $lf ne "\n";
my $cur = Email::MIME->new($buf);
- if ($cur->header('Subject') ne $mime->header('Subject') ||
- norm_body($cur) ne norm_body($mime)) {
+ my $cur_s = $cur->header('Subject');
+ $cur_s = '' unless defined $cur_s;
+ my $cur_m = $mime->header('Subject');
+ $cur_m = '' unless defined $cur_m;
+ if ($cur_s ne $cur_m || norm_body($cur) ne norm_body($mime)) {
return ('MISMATCH', $cur);
}
# returns undef on duplicate
sub add {
- my ($self, $mime) = @_; # mime = Email::MIME
+ 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');
# kill potentially confusing/misleading headers
$mime->header_set($_) for qw(bytes lines content-length status);
+ if ($check_cb) {
+ $mime = $check_cb->($mime) or return;
+ }
+
$mime = $mime->as_string;
my $blob = $self->{mark}++;
print $w "blob\nmark :$blob\ndata ", length($mime), "\n" or wfail;
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} });
};
}