msg_iter: make ->each_part method for PublicInbox::MIME

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

diff --git a/lib/PublicInbox/MsgIter.pm b/lib/PublicInbox/MsgIter.pm
index fa25564a5db1042f6623ae838270920414fd12f2..cd5a5d99564e9d05c100d521677ca7d62c9deb4f 100644 (file)
--- a/lib/PublicInbox/MsgIter.pm
+++ b/lib/PublicInbox/MsgIter.pm
@@ -7,12 +7,12 @@ use strict;
 use warnings;
 use base qw(Exporter);
 our @EXPORT = qw(msg_iter msg_part_text);
-use PublicInbox::MIME;
 
+# This becomes PublicInbox::MIME->each_part:
 # Like Email::MIME::walk_parts, but this is:
 # * non-recursive
 # * passes depth and indices to the iterator callback
-sub msg_iter ($$;$$) {
+sub em_each_part ($$;$$) {
        my ($mime, $cb, $cb_arg, $do_undef) = @_;
        my @parts = $mime->subparts;
        if (@parts) {
@@ -36,6 +36,17 @@ sub msg_iter ($$;$$) {
        }
 }
 
+# Use this when we may accept Email::MIME from user scripts
+# (not just PublicInbox::MIME)
+sub msg_iter ($$;$$) { # $_[0] = PublicInbox::MIME/Email::MIME-like obj
+       my (undef, $cb, $cb_arg, $once) = @_;
+       if (my $ep = $_[0]->can('each_part')) { # PublicInbox::{MIME,*}
+               $ep->($_[0], $cb, $cb_arg, $once);
+       } else { # for compatibility with existing Email::MIME users:
+               em_each_part($_[0], $cb, $cb_arg, $once);
+       }
+}
+
 sub msg_part_text ($$) {
        my ($part, $ct) = @_;