www: implement generic help text

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

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 27f36a7e486b84337e1e4e4586ab9ec5251e4c65..c2beb19c42e8fcfec42283df04f0d02ddbdef44c 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -10,14 +10,16 @@ use warnings;
 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
 }
 
@@ -38,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
@@ -143,14 +146,13 @@ sub add {
        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');
@@ -236,7 +238,9 @@ sub done {
 
                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} });
                };
        }