replace most uses of PublicInbox::MIME with Eml

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

diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index d83912511451af8f5b14fc295616c88faa43ef1c..3558403bca655dec35a9aba29bcf427a3c578fc8 100644 (file)
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Extends read-only Inbox for writing
@@ -7,8 +7,7 @@ use strict;
 use warnings;
 use base qw(PublicInbox::Inbox);
 use PublicInbox::Import;
-use PublicInbox::Filter::Base;
-*REJECT = *PublicInbox::Filter::Base::REJECT;
+use PublicInbox::Filter::Base qw(REJECT);
 
 use constant {
        PERM_UMASK => 0,
@@ -20,12 +19,13 @@ use constant {
 
 sub new {
        my ($class, $ibx, $creat_opt) = @_;
+       return $ibx if ref($ibx) eq $class;
        my $self = bless $ibx, $class;
 
        # TODO: maybe stop supporting this
        if ($creat_opt) { # for { nproc => $N }
                $self->{-creat_opt} = $creat_opt;
-               init_inbox($self) if ($self->{version} || 1) == 1;
+               init_inbox($self) if $self->version == 1;
        }
        $self;
 }
@@ -40,8 +40,7 @@ sub assert_usable_dir {
 sub init_inbox {
        my ($self, $shards, $skip_epoch, $skip_artnum) = @_;
        # TODO: honor skip_artnum
-       my $v = $self->{version} || 1;
-       if ($v == 1) {
+       if ($self->version == 1) {
                my $dir = assert_usable_dir($self);
                PublicInbox::Import::init_bare($dir);
        } else {
@@ -52,7 +51,7 @@ sub init_inbox {
 
 sub importer {
        my ($self, $parallel) = @_;
-       my $v = $self->{version} || 1;
+       my $v = $self->version;
        if ($v == 2) {
                eval { require PublicInbox::V2Writable };
                die "v2 not supported: $@\n" if $@;
@@ -76,7 +75,7 @@ sub filter {
                # v2 keeps msgmap open, which causes conflicts for filters
                # such as PublicInbox::Filter::RubyLang which overload msgmap
                # for a predictable serial number.
-               if ($im && ($self->{version} || 1) >= 2 && $self->{altid}) {
+               if ($im && $self->version >= 2 && $self->{altid}) {
                        $im->done;
                }
 
@@ -112,13 +111,13 @@ sub is_maildir_path ($) {
        (is_maildir_basename($p[-1]) && -f $path) ? 1 : 0;
 }
 
-sub maildir_path_load ($) {
+sub mime_from_path ($) {
        my ($path) = @_;
        if (open my $fh, '<', $path) {
                local $/;
                my $str = <$fh>;
                $str or return;
-               return PublicInbox::MIME->new(\$str);
+               return PublicInbox::Eml->new(\$str);
        } elsif ($!{ENOENT}) {
                # common with Maildir
                return;
@@ -139,7 +138,7 @@ sub import_maildir {
                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 = maildir_path_load("$dir/$fn") or next;
+                       my $mime = mime_from_path("$dir/$fn") or next;
 
                        if (my $filter = $self->filter($im)) {
                                my $ret = $filter->scrub($mime) or return;
@@ -158,12 +157,12 @@ my $from_strict = qr/^From \S+ +\S+ \S+ +\S+ [^:]+:[^:]+:[^:]+ [^:]+/;
 sub mb_add ($$$$) {
        my ($im, $variant, $filter, $msg) = @_;
        $$msg =~ s/(\r?\n)+\z/$1/s;
-       my $mime = PublicInbox::MIME->new($msg);
        if ($variant eq 'mboxrd') {
-               $$msg =~ s/^>(>*From )/$1/sm;
+               $$msg =~ s/^>(>*From )/$1/gms;
        } elsif ($variant eq 'mboxo') {
-               $$msg =~ s/^>From /From /sm;
+               $$msg =~ s/^>From /From /gms;
        }
+       my $mime = PublicInbox::Eml->new($msg);
        if ($filter) {
                my $ret = $filter->scrub($mime) or return;
                return if $ret == REJECT();