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
$b
}
+sub _check_path ($$$$) {
+ my ($r, $w, $tip, $path) = @_;
+ return if $tip eq '';
+ print $w "ls $tip $path\n" or wfail;
+ local $/ = "\n";
+ defined(my $info = <$r>) or die "EOF from fast-import: $!";
+ $info =~ /\Amissing / ? undef : $info;
+}
+
# returns undef on non-existent
# ('MISMATCH', msg) on mismatch
# (:MARK, msg) on success
my ($r, $w) = $self->gfi_start;
my $tip = $self->{tip};
- return ('MISSING', undef) if $tip eq '';
-
- print $w "ls $tip $path\n" or wfail;
- local $/ = "\n";
- my $check = <$r>;
- defined $check or die "EOF from fast-import / ls: $!";
- return ('MISSING', undef) if $check =~ /\Amissing /;
- $check =~ m!\A100644 blob ([a-f0-9]{40})\t!s or die "not blob: $check";
+ my $info = _check_path($r, $w, $tip, $path) or return ('MISSING',undef);
+ $info =~ m!\A100644 blob ([a-f0-9]{40})\t!s or die "not blob: $info";
my $blob = $1;
+
print $w "cat-blob $blob\n" or wfail;
- $check = <$r>;
- defined $check or die "EOF from fast-import / cat-blob: $!";
- $check =~ /\A[a-f0-9]{40} blob (\d+)\n\z/ or
- die "unexpected cat-blob response: $check";
+ local $/ = "\n";
+ $info = <$r>;
+ defined $info or die "EOF from fast-import / cat-blob: $!";
+ $info =~ /\A[a-f0-9]{40} blob (\d+)\n\z/ or
+ die "unexpected cat-blob response: $info";
my $left = $1;
my $offset = 0;
my $buf = '';
$n = read($r, my $lf, 1);
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 = PublicInbox::MIME->new($buf);
+ 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');
my ($r, $w) = $self->gfi_start;
my $tip = $self->{tip};
- if ($tip ne '') {
- print $w "ls $tip $path\n" or wfail;
- local $/ = "\n";
- my $check = <$r>;
- defined $check or die "EOF from fast-import: $!";
- return unless $check =~ /\Amissing /;
- }
+ _check_path($r, $w, $tip, $path) and return;
# 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;
$self->{tip} = ":$commit";
}
+sub run_die ($$) {
+ my ($cmd, $env) = @_;
+ my $pid = spawn($cmd, $env, undef);
+ defined $pid or die "spawning ".join(' ', @$cmd)." failed: $!";
+ waitpid($pid, 0) == $pid or die join(' ', @$cmd) .' did not finish';
+ $? == 0 or die join(' ', @$cmd) . " failed: $?\n";
+}
+
sub done {
my ($self) = @_;
my $w = delete $self->{out} or return;
if ($nchg && !$ENV{FAST}) {
my $index = "$git_dir/ssoma.index";
my $env = { GIT_INDEX_FILE => $index };
- my @rt = (@cmd, qw(read-tree -m -v -i), $self->{ref});
- $pid = spawn(\@rt, $env, undef);
- defined $pid or die "spawn read-tree failed: $!";
- waitpid($pid, 0) == $pid or die 'read-tree did not finish';
- $? == 0 or die "failed to update $git_dir/ssoma.index: $?\n";
+ run_die([@cmd, qw(read-tree -m -v -i), $self->{ref}], $env);
}
if ($nchg) {
- $pid = spawn([@cmd, 'update-server-info'], undef, undef);
- defined $pid or die "spawn update-server-info failed: $!\n";
- waitpid($pid, 0) == $pid or
- die 'update-server-info did not finish';
- $? == 0 or die "failed to update-server-info: $?\n";
-
+ run_die([@cmd, 'update-server-info'], undef);
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} });
};
+
+ eval { run_die([@cmd, qw(gc --auto)], undef) };
}
my $lockfh = delete $self->{lockfh} or die "BUG: not locked: $!";