watchmaildir: ensure I:/W:/E: prefixes in warnings

[public-inbox.git] / Documentation / mknews.perl

diff --git a/Documentation/mknews.perl b/Documentation/mknews.perl
index ba049d9e64e1a6229ba9e11e0314d0cdcd7593d7..f053e2bfb9e558541778762a4d6b3b79bd0b633d 100755 (executable)
--- a/Documentation/mknews.perl
+++ b/Documentation/mknews.perl
@@ -37,7 +37,7 @@ if ($dst eq 'NEWS') {
        my $ibx = My::MockObject->new(
                description => 'public-inbox releases',
                over => undef,
-               search => 1, # for WwwStream:_html_top
+               search => 1, # for WwwStream::html_top
                base_url => "$base_url/",
        );
        $ibx->{-primary_address} = $addr;
@@ -103,17 +103,18 @@ sub mime2txt {
 
 sub mime2html {
        my ($out, $eml, $ctx) = @_;
-       my $smsg = bless {}, 'PublicInbox::Smsg';
+       my $smsg = $ctx->{smsg} = bless {}, 'PublicInbox::Smsg';
        $smsg->populate($eml);
-       print $out PublicInbox::View::eml_entry($ctx, $smsg, $eml, 1) or die;
+       $ctx->{msgs} = [ 1 ]; # for <hr> in eml_entry
+       print $out PublicInbox::View::eml_entry($ctx, $eml) or die;
 }
 
 sub html_start {
        my ($out, $ctx) = @_;
        require PublicInbox::WwwStream;
        $ctx->{www} = My::MockObject->new(style => '');
-       my $www_stream = PublicInbox::WwwStream->new($ctx);
-       print $out $www_stream->_html_top, '<pre>' or die;
+       my $www_stream = PublicInbox::WwwStream::init($ctx);
+       print $out $www_stream->html_top, '<pre>' or die;
 }
 
 sub html_end {
@@ -147,9 +148,10 @@ EOF
 }
 
 sub mime2atom  {
-       my ($out, $astream, $mime, $ctx) = @_;
-       my $smsg = bless { mime => $mime }, 'PublicInbox::Smsg';
-       if (defined(my $str = $astream->feed_entry($smsg))) {
+       my ($out, $astream, $eml, $ctx) = @_;
+       my $smsg = bless {}, 'PublicInbox::Smsg';
+       $smsg->populate($eml);
+       if (defined(my $str = $astream->feed_entry($smsg, $eml))) {
                print $out $str or die;
        }
 }