replace most uses of PublicInbox::MIME with Eml

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

diff --git a/lib/PublicInbox/WwwAttach.pm b/lib/PublicInbox/WwwAttach.pm
index cda1c6c8db3a0745e8ad28a1cffaad05e10de6cf..5b2914b393fdcc28ea3d220eeac3137004ae3b8d 100644 (file)
--- a/lib/PublicInbox/WwwAttach.pm
+++ b/lib/PublicInbox/WwwAttach.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # For retrieving attachments from messages in the WWW interface
@@ -7,13 +7,12 @@ use strict;
 use warnings;
 use bytes (); # only for bytes::length
 use Email::MIME::ContentType qw(parse_content_type);
-use PublicInbox::MIME;
-use PublicInbox::MsgIter;
+use PublicInbox::Eml;
 
-sub get_attach_i { # msg_iter callback
-       my ($part, $depth, @idx) = @{$_[0]};
+sub get_attach_i { # ->each_part callback
+       my ($part, $depth, $idx) = @{$_[0]};
        my $res = $_[1];
-       return if join('.', @idx) ne $res->[3]; # $idx
+       return if $idx ne $res->[3]; # [0-9]+(?:\.[0-9]+)+
        $res->[0] = 200;
        my $ct = $part->content_type;
        $ct = parse_content_type($ct) if $ct;
@@ -38,9 +37,9 @@ sub get_attach ($$$) {
        my ($ctx, $idx, $fn) = @_;
        my $res = [ 404, [ 'Content-Type', 'text/plain' ], [ "Not found\n" ] ];
        my $mime = $ctx->{-inbox}->msg_by_mid($ctx->{mid}) or return $res;
-       $mime = PublicInbox::MIME->new($mime);
+       $mime = PublicInbox::Eml->new($mime);
        $res->[3] = $idx;
-       msg_iter($mime, \&get_attach_i, $res);
+       $mime->each_part(\&get_attach_i, $res, 1);
        pop @$res; # cleanup before letting PSGI server see it
        $res
 }