lei convert: support IMAP output and "-F eml" inputs

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

diff --git a/lib/PublicInbox/NetWriter.pm b/lib/PublicInbox/NetWriter.pm
index 89f8662efa647009ce68778e94c95c2d94a1e7ff..e26e9815610a3680aab3e6dc05a1321f9f94c1e9 100644 (file)
--- a/lib/PublicInbox/NetWriter.pm
+++ b/lib/PublicInbox/NetWriter.pm
@@ -16,7 +16,8 @@ my %IMAPkw2flags;
 sub imap_append {
        my ($mic, $folder, $bref, $smsg, $eml) = @_;
        $bref //= \($eml->as_string);
-       $smsg //= bless { }, 'PublicInbox::Smsg';
+       $smsg //= bless {}, 'PublicInbox::Smsg';
+       bless($smsg, 'PublicInbox::Smsg') if ref($smsg) eq 'HASH';
        $smsg->{ts} //= msg_timestamp($eml // PublicInbox::Eml->new($$bref));
        my @f = map { $IMAPkw2flags{$_} } @{$smsg->{kw}};
        $mic->append_string($folder, $$bref, "@f", $smsg->internaldate) or
@@ -28,7 +29,7 @@ sub imap_delete_all {
        my $uri = PublicInbox::URIimap->new($url);
        my $sec = $self->can('uri_section')->($uri);
        local $0 = $uri->mailbox." $sec";
-       my $mic = $self->mic_get($sec) or die "E: not connected: $@";
+       my $mic = $self->mic_get($uri) or die "E: not connected: $@";
        $mic->select($uri->mailbox) or return; # non-existent
        if ($mic->delete_message('1:*')) {
                $mic->expunge;