X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FImport.pm;h=8eec17eb852560af14d90e1dc6b6a7f7f11f89d9;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=1f52a0cc80f9eddd40a8e16f7b44496a4085b005;hpb=1f89e15a29cd63335f40902f1de7944e2efe91fa;p=public-inbox.git diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index 1f52a0cc..8eec17eb 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016 all contributors +# Copyright (C) 2016-2018 all contributors # License: AGPL-3.0+ # # git fast-import-based ssoma-mda MDA replacement @@ -8,17 +8,18 @@ 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); +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 } @@ -39,6 +40,7 @@ sub gfi_start { # 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 @@ -51,6 +53,9 @@ sub gfi_start { $self->{out} = $out_w; $self->{lockfh} = $lockfh; $self->{pid} = $pid; + $self->{nchg} = 0; + binmode $out_w, ':raw' or die "binmode :raw failed: $!"; + binmode $in_r, ':raw' or die "binmode :raw failed: $!"; ($in_r, $out_w); } @@ -72,31 +77,36 @@ sub norm_body ($) { $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 sub remove { - my ($self, $mime) = @_; # mime = Email::MIME + my ($self, $mime, $msg) = @_; # mime = Email::MIME my $mid = mid_mime($mime); my $path = mid2path($mid); 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 = ''; @@ -111,9 +121,12 @@ sub remove { $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); } @@ -125,47 +138,47 @@ sub remove { } my $ident = $self->{ident}; my $now = now2822(); + $msg ||= 'rm'; + my $len = length($msg) + 1; print $w "commit $ref\nmark :$commit\n", "author $ident $now\n", "committer $ident $now\n", - "data 3\nrm\n\n", + "data $len\n$msg\n\n", 'from ', ($parent ? $parent : $tip), "\n" or wfail; print $w "D $path\n\n" or wfail; + $self->{nchg}++; (($self->{tip} = ":$commit"), $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 @from = Email::Address->parse($from); - my $name = $from[0]->name; - my $email = $from[0]->address; + my ($email) = PublicInbox::Address::emails($from); + my ($name) = PublicInbox::Address::names($from); + # git gets confused with: + # "'A U Thor ' via foo" + # ref: + # + $name =~ tr/<>//d; + 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); - # git gets confused with: - # "'A U Thor ' via foo" - # ref: - # - $name =~ s/<([^>]+)>/($1)/g; - 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; @@ -178,22 +191,31 @@ sub add { print $w "reset $ref\n" or wfail; } + utf8::encode($email); + utf8::encode($name); + utf8::encode($subject); # quiet down wide character warnings: - binmode $w, ':utf8' or die "binmode :utf8 failed: $!"; print $w "commit $ref\nmark :$commit\n", "author $name <$email> $date\n", - "committer $self->{ident} ", now2822(), "\n", - "data ", (bytes::length($subject) + 1), "\n", + "committer $self->{ident} ", now2822(), "\n" or wfail; + print $w "data ", (length($subject) + 1), "\n", $subject, "\n\n" or wfail; - binmode $w, ':raw' or die "binmode :raw failed: $!"; - if ($tip ne '') { print $w 'from ', ($parent ? $parent : $tip), "\n" or wfail; } print $w "M 100644 :$blob $path\n\n" or wfail; + $self->{nchg}++; $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; @@ -202,26 +224,29 @@ sub done { my $pid = delete $self->{pid} or die 'BUG: missing {pid} when done'; waitpid($pid, 0) == $pid or die 'fast-import did not finish'; $? == 0 or die "fast-import failed: $?"; + my $nchg = delete $self->{nchg}; # for compatibility with existing ssoma installations # we can probably remove this entirely by 2020 my $git_dir = $self->{git}->{git_dir}; - my $index = "$git_dir/ssoma.index"; # XXX: change the following scope to: if (-e $index) # in 2018 or so.. my @cmd = ('git', "--git-dir=$git_dir"); - unless ($ENV{FAST}) { + 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) { + run_die([@cmd, 'update-server-info'], undef); + eval { + require PublicInbox::SearchIdx; + 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) }; } - - $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"; my $lockfh = delete $self->{lockfh} or die "BUG: not locked: $!"; flock($lockfh, LOCK_UN) or die "unlock failed: $!";