";
# newest to oldest
@@ -21,8 +22,8 @@ my $atom_url = 'https://public-inbox.org/NEWS.atom';
my $addr = 'meta@public-inbox.org';
my $latest = shift(@releases) or die 'no releases?';
-my $mime_latest = release2mime($latest);
-my $mtime = msg_datestamp($mime_latest->header_obj);
+my $mtime;
+my $mime_latest = release2mime($latest, \$mtime);
my $tmp = "$dst+";
my $out;
if ($dst eq 'NEWS') {
@@ -34,15 +35,15 @@ if ($dst eq 'NEWS') {
}
} elsif ($dst eq 'NEWS.atom' || $dst eq 'NEWS.html') {
open $out, '>', $tmp or die;
- my $ibx = Plack::Util::inline_object(
- description => sub { 'public-inbox releases' },
- over => sub { undef },
- search => sub { 1 }, # for WwwStream:_html_top
- base_url => sub { "$base_url/" },
+ my $ibx = My::MockObject->new(
+ description => 'public-inbox releases',
+ over => undef,
+ search => 1, # for WwwStream::html_top
+ base_url => "$base_url/",
);
$ibx->{-primary_address} = $addr;
my $ctx = {
- -inbox => $ibx,
+ ibx => $ibx,
-upfx => "$base_url/",
-hr => 1,
};
@@ -73,17 +74,25 @@ rename($tmp, $dst) or die;
exit 0;
sub release2mime {
- my $f = "$dir/$_[0].eml";
+ my ($release, $mtime_ref) = @_;
+ my $f = "$dir/$release.eml";
open(my $fh, '<', $f) or die "open($f): $!";
- PublicInbox::MIME->new(do { local $/; <$fh> });
+ my $mime = PublicInbox::Eml->new(\(do { local $/; <$fh> }));
+ # Documentation/include.mk relies on mtimes of each .eml file
+ # to trigger rebuild, so make sure we sync the mtime to the Date:
+ # header in the .eml
+ my $mtime = msg_datestamp($mime->header_obj);
+ utime($mtime, $mtime, $fh) or warn "futimes $f: $!";
+ $$mtime_ref = $mtime if $mtime_ref;
+ $mime;
}
sub mime2txt {
my ($out, $mime) = @_;
- my $title = $mime->header_str('Subject');
+ my $title = $mime->header('Subject');
$title =~ s/^\s*\[\w+\]\s*//g; # [ANNOUNCE] or [ANN]
my $dtime = msg_datestamp($mime->header_obj);
- $title .= ' - ' . PublicInbox::View::fmt_ts($dtime) . ' UTC';
+ $title .= ' - ' . fmt_ts($dtime) . ' UTC';
print $out $title, "\n" or die;
my $uline = '=' x length($title);
print $out $uline, "\n\n" or die;
@@ -94,24 +103,26 @@ sub mime2txt {
}
sub mime2html {
- my ($out, $mime, $ctx) = @_;
- my $smsg = bless { mime => $mime }, 'PublicInbox::SearchMsg';
- print $out PublicInbox::View::index_entry($smsg, $ctx, 1) or die;
+ my ($out, $eml, $ctx) = @_;
+ my $smsg = $ctx->{smsg} = bless {}, 'PublicInbox::Smsg';
+ $smsg->populate($eml);
+ $ctx->{msgs} = [ 1 ]; # for
in eml_entry
+ print $out PublicInbox::View::eml_entry($ctx, $eml) or die;
}
sub html_start {
my ($out, $ctx) = @_;
require PublicInbox::WwwStream;
- $ctx->{www} = Plack::Util::inline_object(style => sub { '' });
- my $www_stream = PublicInbox::WwwStream->new($ctx);
- print $out $www_stream->_html_top, '' or die;
+ $ctx->{www} = My::MockObject->new(style => '');
+ my $www_stream = PublicInbox::WwwStream::init($ctx);
+ print $out $www_stream->html_top, '' or die;
}
sub html_end {
- print $out <