use warnings;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
use PublicInbox::AdminEdit;
-use File::Temp qw(tempfile);
+use File::Temp ();
use PublicInbox::ContentId qw(content_id);
use PublicInbox::MID qw(mid_clean mids);
PublicInbox::Admin::check_require('-index');
my $found = {}; # cid => [ [ibx, smsg] [, [ibx, smsg] ] ]
-sub find_mid ($) {
- my ($mid) = @_;
- foreach my $ibx (@ibxs) {
+sub find_mid ($$$) {
+ my ($found, $mid, $ibxs) = @_;
+ foreach my $ibx (@$ibxs) {
my $over = $ibx->over;
my ($id, $prev);
while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) {
sub show_cmd ($$) {
my ($ibx, $smsg) = @_;
- " GIT_DIR=$ibx->{mainrepo}/all.git \\\n git show $smsg->{blob}\n";
+ " GIT_DIR=$ibx->{inboxdir}/all.git \\\n git show $smsg->{blob}\n";
}
-sub show_found () {
+sub show_found ($) {
+ my ($found) = @_;
foreach my $to_edit (values %$found) {
foreach my $tuple (@$to_edit) {
my ($ibx, $smsg) = @$tuple;
if (defined($mid)) {
$mid = mid_clean($mid);
- $found = find_mid($mid);
+ find_mid($found, $mid, \@ibxs);
my $nr = scalar(keys %$found);
die "No message found for <$mid>\n" unless $nr;
if ($nr > 1) {
Multiple messages with different content found matching
<$mid>:
- show_found();
+ show_found($found);
die "Use --force to edit all of them\n" if !$opt->{force};
warn "Will edit all of them\n";
}
my $orig = do { local $/; <$fh> };
my $mime = PublicInbox::MIME->new(\$orig);
my $mids = mids($mime->header_obj);
- find_mid($_) for (@$mids); # populates $found
+ find_mid($found, $_, \@ibxs) for (@$mids); # populates $found
my $cid = content_id($mime);
my $to_edit = $found->{$cid};
unless ($to_edit) {
$nr matches to Message-ID(s) in $file, but none matched content
Partial matches below:
- show_found();
+ show_found($found);
} elsif ($nr == 0) {
$mids = join('', map { " <$_>\n" } @$mids);
warn <<"";
$found = { $cid => $to_edit };
}
-my $tmpl = 'public-inbox-edit-XXXXXX';
+my %tmpopt = (
+ TEMPLATE => 'public-inbox-edit-XXXXXX',
+ TMPDIR => 1,
+ SUFFIX => $opt->{raw} ? '.eml' : '.mbox',
+);
+
foreach my $to_edit (values %$found) {
- my ($edit_fh, $edit_fn) = tempfile($tmpl, TMPDIR => 1, UNLINK => 1);
+ my $edit_fh = File::Temp->new(%tmpopt);
$edit_fh->autoflush(1);
+ my $edit_fn = $edit_fh->filename;
my ($ibx, $smsg) = @{$to_edit->[0]};
my $old_raw = $ibx->msg_by_smsg($smsg);
delete @$ibx{qw(over mm git search)}; # cleanup
my $tmp = $$old_raw;
if (!$opt->{raw}) {
my $oid = $smsg->{blob};
- print $edit_fh "From mboxrd\@$oid Thu Jan 1 00:00:00 1970\n";
+ print $edit_fh "From mboxrd\@$oid Thu Jan 1 00:00:00 1970\n"
+ or die "failed to write From_ line: $!";
$tmp =~ s/^(>*From )/>$1/gm;
}
print $edit_fh $tmp or
chomp(my $op = <STDIN> || '');
$op = lc($op);
goto retry_edit if $op eq 'r';
- exit $? if $op eq 'q';
+ if ($op eq 'q') {
+ # n.b. we'll lose the exit signal, here,
+ # oh well; "q" is user-specified anyways.
+ exit($? >> 8);
+ }
last if $op eq 'c'; # continuing
print STDERR "\`$op' not recognized\n";
}