# Copyright (C) 2015 all contributors <meta@public-inbox.org>
# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
-# Streaming interface for formatting messages as an mboxrd
+
+# Streaming interface for formatting messages as an mboxrd.
+# Used by the web interface
package PublicInbox::Mbox;
use strict;
use warnings;
-use PublicInbox::MID qw/mid2path/;
+use PublicInbox::MID qw/mid2path mid_clean/;
+use URI::Escape qw/uri_escape_utf8/;
require Email::Simple;
sub thread_mbox {
sub emit1 {
my $simple = Email::Simple->new(pop);
+ my $ctx = pop;
sub {
my ($response) = @_;
# single message should be easily renderable in browsers
my $fh = $response->([200, ['Content-Type'=>'text/plain']]);
- emit_msg($fh, $simple);
+ emit_msg($ctx, $fh, $simple);
$fh->close;
}
}
sub emit_msg {
- my ($fh, $simple) = @_; # Email::Simple object
+ my ($ctx, $fh, $simple) = @_; # Email::Simple object
my $header_obj = $simple->header_obj;
# drop potentially confusing headers, ssoma already should've dropped
# Lines and Content-Length
- foreach my $d (qw(Lines Content-Length Status)) {
+ foreach my $d (qw(Lines Bytes Content-Length Status)) {
$header_obj->header_set($d);
}
+ my $feed_opts = $ctx->{feed_opts};
+ unless ($feed_opts) {
+ require PublicInbox::Feed; # FIXME: gross
+ $feed_opts = PublicInbox::Feed::get_feedopts($ctx);
+ $ctx->{feed_opts} = $feed_opts;
+ }
+ my $base = $feed_opts->{url};
+ my $mid = mid_clean($header_obj->header('Message-ID'));
+ $mid = uri_escape_utf8($mid);
+ my @archived_at = $header_obj->header('Archived-At');
+ push @archived_at, "<$base$mid/>";
+ $header_obj->header_set('Archived-At', @archived_at);
+ $header_obj->header_set('List-Archive', "<$base>");
+ $header_obj->header_set('List-Post', "<mailto:$feed_opts->{id_addr}>");
my $buf = $header_obj->as_string;
unless ($buf =~ /\AFrom /) {
my $fh = $response->([200, ['Content-Type' => "application/$type"]]);
$fh = PublicInbox::MboxGz->new($fh) if $sfx;
- require PublicInbox::GitCatFile;
+ require PublicInbox::Git;
my $mid = $ctx->{mid};
- my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
+ my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
my %opts = (offset => 0);
my $nr;
do {
my $p = 'HEAD:'.mid2path($smsg->mid);
Email::Simple->new($git->cat_file($p));
};
- emit_msg($fh, $msg) if $msg;
+ emit_msg($ctx, $fh, $msg) if $msg;
}
$opts{offset} += $nr;
package PublicInbox::MboxGz;
use strict;
use warnings;
-use fields qw(gz fh buf);
sub new {
my ($class, $fh) = @_;
- my $self = fields::new($class);
my $buf;
- $self->{buf} = \$buf;
- $self->{gz} = IO::Compress::Gzip->new(\$buf);
- $self->{fh} = $fh;
- $self;
+ bless {
+ buf => \$buf,
+ gz => IO::Compress::Gzip->new(\$buf),
+ fh => $fh,
+ }, $class;
}
sub _flush_buf {