# Extends read-only Inbox for writing
package PublicInbox::InboxWritable;
use strict;
-use warnings;
-use base qw(PublicInbox::Inbox);
+use v5.10.1;
+use parent qw(PublicInbox::Inbox Exporter);
use PublicInbox::Import;
use PublicInbox::Filter::Base qw(REJECT);
use Errno qw(ENOENT);
+our @EXPORT_OK = qw(eml_from_path);
use constant {
PERM_UMASK => 0,
(is_maildir_basename($p[-1]) && -f $path) ? 1 : 0;
}
-sub mime_from_path ($) {
+sub eml_from_path ($) {
my ($path) = @_;
if (open my $fh, '<', $path) {
my $str = do { local $/; <$fh> } or return;
opendir my $dh, "$dir/$sub" or die "opendir $dir/$sub: $!\n";
while (defined(my $fn = readdir($dh))) {
next unless is_maildir_basename($fn);
- my $mime = mime_from_path("$dir/$fn") or next;
+ my $mime = eml_from_path("$dir/$fn") or next;
if (my $filter = $self->filter($im)) {
my $ret = $filter->scrub($mime) or return;
use strict;
use warnings;
use PublicInbox::Eml;
-use PublicInbox::InboxWritable;
+use PublicInbox::InboxWritable qw(eml_from_path);
use PublicInbox::Filter::Base qw(REJECT);
use PublicInbox::Spamcheck;
use PublicInbox::Sigfd;
use PublicInbox::MID qw(mids);
use PublicInbox::ContentHash qw(content_hash);
use POSIX qw(_exit);
-*mime_from_path = \&PublicInbox::InboxWritable::mime_from_path;
sub compile_watchheaders ($) {
my ($ibx) = @_;
my ($self, $path) = @_;
# path must be marked as (S)een
$path =~ /:2,[A-R]*S[T-Za-z]*\z/ or return;
- my $eml = mime_from_path($path) or return;
+ my $eml = eml_from_path($path) or return;
$self->{config}->each_inbox(\&remove_eml_i, [ $self, $eml, $path ]);
}
return _remove_spam($self, $path);
}
foreach my $ibx (@$inboxes) {
- my $eml = mime_from_path($path) or next;
+ my $eml = eml_from_path($path) or next;
import_eml($self, $ibx, $eml);
}
}
use PublicInbox::MID qw(mid_clean mids);
PublicInbox::Admin::check_require('-index');
use PublicInbox::Eml;
-use PublicInbox::InboxWritable;
+use PublicInbox::InboxWritable qw(eml_from_path);
use PublicInbox::Import;
my $usage = "$0 -m MESSAGE_ID [--all] [INBOX_DIRS]";
warn "Will edit all of them\n";
}
} else {
- my $mime = PublicInbox::InboxWritable::mime_from_path($file) or
- die "open($file) failed: $!";
- my $mids = mids($mime->header_obj);
+ my $eml = eml_from_path($file) or die "open($file) failed: $!";
+ my $mids = mids($eml->header_obj);
find_mid($found, $_, \@ibxs) for (@$mids); # populates $found
- my $chash = content_hash($mime);
+ my $chash = content_hash($eml);
my $to_edit = $found->{$chash};
unless ($to_edit) {
my $nr = scalar(keys %$found);