# requires read-only access.
package PublicInbox::Import;
use strict;
-use warnings;
-use base qw(PublicInbox::Lock);
+use parent qw(PublicInbox::Lock);
+use v5.10.1;
use PublicInbox::Spawn qw(spawn popen_rd);
use PublicInbox::MID qw(mids mid2path);
use PublicInbox::Address;
my ($class, $git, $name, $email, $ibx) = @_;
my $ref = 'refs/heads/master';
if ($ibx) {
- $ref = $ibx->{ref_head} || 'refs/heads/master';
- $name ||= $ibx->{name};
- $email ||= $ibx->{-primary_address};
- $git ||= $ibx->git;
+ $ref = $ibx->{ref_head} // 'refs/heads/master';
+ $name //= $ibx->{name};
+ $email //= $ibx->{-primary_address};
+ $git //= $ibx->git;
}
bless {
git => $git,
my ($self, $msg) = @_;
return unless $self->{pid};
print { $self->{out} } "progress $msg\n" or wfail;
- $self->{in}->getline eq "progress $msg\n" or die
+ readline($self->{in}) eq "progress $msg\n" or die
"progress $msg not received\n";
undef;
}
}
my $ident = $self->{ident};
my $now = now_raw();
- $msg ||= 'rm';
+ $msg //= 'rm';
my $len = length($msg) + 1;
print $w "commit $ref\nmark :$commit\n",
"author $ident $now\n",
sub extract_cmt_info ($;$) {
my ($mime, $smsg) = @_;
+ # $mime is PublicInbox::Eml, but remains Email::MIME-compatible
my $sender = '';
- my $from = $mime->header('From');
- $from ||= '';
+ my $hdr = $mime->header_obj;
+ my $from = $hdr->header('From') // '';
my ($email) = PublicInbox::Address::emails($from);
my ($name) = PublicInbox::Address::names($from);
if (!defined($name) || !defined($email)) {
- $sender = $mime->header('Sender');
- $sender ||= '';
- if (!defined($name)) {
- ($name) = PublicInbox::Address::names($sender);
- }
- if (!defined($email)) {
- ($email) = PublicInbox::Address::emails($sender);
- }
+ $sender = $hdr->header('Sender') // '';
+ $name //= (PublicInbox::Address::names($sender))[0];
+ $email //= (PublicInbox::Address::emails($sender))[0];
}
if (defined $email) {
# Email::Address::XS may leave quoted '<' in addresses,
warn "no name in From: $from or Sender: $sender\n";
}
- my $hdr = $mime->header_obj;
-
- my $subject = $hdr->header('Subject');
- $subject = '(no subject)' unless defined $subject;
- # Mime decoding can create nulls replace them with spaces to protect git
+ my $subject = $hdr->header('Subject') // '(no subject)';
+ # MIME decoding can create nulls replace them with spaces to protect git
$subject =~ tr/\0/ /;
utf8::encode($subject);
my $at = git_timestamp(my @at = msg_datestamp($hdr));
push @buf, "reset $tmp\n";
} elsif (/^commit (?:.+)/) {
if (@buf) {
- $w->print(@buf) or wfail;
+ print $w @buf or wfail;
@buf = ();
}
push @buf, "commit $tmp\n";
rewrite_commit($self, \@oids, \@buf, $mime);
$nreplace++;
}
- $w->print(@buf, "\n") or wfail;
+ print $w @buf, "\n" or wfail;
@buf = ();
} elsif ($_ eq "done\n") {
$done = 1;
}
close $rd or die "close fast-export failed: $?";
if (@buf) {
- $w->print(@buf) or wfail;
+ print $w @buf or wfail;
}
die 'done\n not seen from fast-export' unless $done;
chomp(my $cmt = $self->get_mark(":$mark")) if $nreplace;
=head1 SYNOPSIS
- use Email::MIME;
+ use PublicInbox::Eml;
+ # PublicInbox::Eml exists as of public-inbox 1.5.0,
+ # Email::MIME was used in older versions
+
use PublicInbox::Git;
use PublicInbox::Import;
"Date: Thu, 01 Jan 1970 00:00:00 +0000\n" .
"Message-ID: <m\@example.org>\n".
"\ntest message";
- my $parsed = Email::MIME->new($message);
+ my $parsed = PublicInbox::Eml->new($message);
my $ret = $im->add($parsed);
if (!defined $ret) {
warn "duplicate: ",
$im->done;
# to remove a message
- my $junk = Email::MIME->new($message);
+ my $junk = PublicInbox::Eml->new($message);
my ($mark, $orig) = $im->remove($junk);
if ($mark eq 'MISSING') {
print "not found\n";
=head1 DESCRIPTION
-An importer and remover for public-inboxes which takes L<Email::MIME>
-messages as input and stores them in a git repository as
+An importer and remover for public-inboxes which takes C<PublicInbox::Eml>
+or L<Email::MIME> messages as input and stores them in a git repository as
documented in L<https://public-inbox.org/public-inbox-v1-format.txt>,
except it does not allow duplicate Message-IDs.
=head2 add
- my $parsed = Email::MIME->new($message);
+ my $parsed = PublicInbox::Eml->new($message);
$im->add($parsed);
Adds a message to to the git repository. This will acquire
=head2 remove
- my $junk = Email::MIME->new($message);
+ my $junk = PublicInbox::Eml->new($message);
my ($code, $orig) = $im->remove($junk);
Removes a message from the repository. On success, it returns
a ':'-prefixed numeric code representing the git-fast-import
-mark and the original messages as an Email::MIME object.
+mark and the original messages as a PublicInbox::Eml
+(or Email::MIME) object.
If the message could not be found, the code is "MISSING"
and the original message is undef. If there is a mismatch where
the "Message-ID" is matched but the subject and body do not match,
=head1 COPYRIGHT
-Copyright (C) 2016 all contributors L<mailto:meta@public-inbox.org>
+Copyright (C) 2016-2020 all contributors L<mailto:meta@public-inbox.org>
License: AGPL-3.0+ L<http://www.gnu.org/licenses/agpl-3.0.txt>