X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMbox.pm;h=1c97f959c84502f6529310af2b5f6704f4858c30;hb=2c69f7bc34a2b12dc7f55e2bb24fa28565f24f03;hp=fcb266939e1707e39d3e82b70751cd3e600793a2;hpb=7e3c392a55686d2ffe8611483e80a3ccc19e95f2;p=public-inbox.git
diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index fcb26693..1c97f959 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -1,74 +1,93 @@
-# Copyright (C) 2015, all contributors
+# Copyright (C) 2015 all contributors
# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
-# Streaming interface for formatting messages as an mbox
+
+# Streaming interface for formatting messages as an mboxrd.
+# Used by the web interface
package PublicInbox::Mbox;
use strict;
use warnings;
-use PublicInbox::MID qw/mid_compressed mid2path/;
-
-sub thread_mbox {
- my ($ctx, $srch) = @_;
- sub {
- my ($response) = @_; # Plack callback
- emit_mbox($response, $ctx, $srch);
- }
+use PublicInbox::MID qw/mid_clean/;
+use URI::Escape qw/uri_escape_utf8/;
+use Plack::Util;
+require Email::Simple;
+
+sub emit1 {
+ my ($ctx, $msg) = @_;
+ $msg = Email::Simple->new($msg);
+ # single message should be easily renderable in browsers
+ [200, ['Content-Type', 'text/plain'], [ msg_str($ctx, $msg)] ]
}
-sub emit_msg {
- my ($fh, $simple) = @_; # Email::Simple object
+sub msg_str {
+ my ($ctx, $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)) {
- $simple->header_set($d);
+ foreach my $d (qw(Lines Bytes Content-Length Status)) {
+ $header_obj->header_set($d);
}
-
- my $buf = $simple->header_obj->as_string;
- unless ($buf =~ /\AFrom /) {
- $fh->write("From a\@a Thu Jan 1 00:00:00 1970\n");
+ my $ibx = $ctx->{-inbox};
+ my $base = $ibx->base_url($ctx->{cgi});
+ my $mid = mid_clean($header_obj->header('Message-ID'));
+ $mid = uri_escape_utf8($mid);
+ my @append = (
+ 'Archived-At', "<$base$mid/>",
+ 'List-Archive', "<$base>",
+ 'List-Post', "{-primary_address}>",
+ );
+ my $crlf = $simple->crlf;
+ my $buf = "From mboxrd\@z Thu Jan 1 00:00:00 1970\n" .
+ $header_obj->as_string;
+ for (my $i = 0; $i < @append; $i += 2) {
+ my $k = $append[$i];
+ my $v = $append[$i + 1];
+ my @v = $header_obj->header($k);
+ foreach (@v) {
+ if ($v eq $_) {
+ $v = undef;
+ last;
+ }
+ }
+ $buf .= "$k: $v$crlf" if defined $v;
}
- $fh->write($buf .= $simple->crlf);
-
- $buf = $simple->body;
- $simple->body_set('');
- $buf =~ s/^(From )/>$1/gm;
- $buf .= "\n" unless $buf =~ /\n\z/s;
-
- $fh->write($buf);
+ $buf .= $crlf;
+
+ # mboxrd quoting style
+ # ref: http://www.qmail.org/man/man5/mbox.html
+ my $body = $simple->body;
+ $body =~ s/^(>*From )/>$1/gm;
+ $buf .= $body;
+ $buf .= "\n";
}
-sub emit_mbox {
- my ($response, $ctx, $srch) = @_;
+sub thread_mbox {
+ my ($ctx, $srch, $sfx) = @_;
eval { require IO::Compress::Gzip };
- return need_gzip($response) if $@;
+ return sub { need_gzip(@_) } if $@;
+ my $cb = sub { $srch->get_thread($ctx->{mid}, @_) };
# http://www.iana.org/assignments/media-types/application/gzip
- # http://www.iana.org/assignments/media-types/application/mbox
- my $fh = $response->([200, ['Content-Type' => 'application/gzip']]);
- $fh = PublicInbox::MboxGz->new($fh);
-
- require PublicInbox::GitCatFile;
- require Email::Simple;
- my $mid = mid_compressed($ctx->{mid});
- my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
- my %opts = (offset => 0);
- my $nr;
- do {
- my $res = $srch->get_thread($mid, \%opts);
- my $msgs = $res->{msgs};
- $nr = scalar @$msgs;
- while (defined(my $smsg = shift @$msgs)) {
- my $msg = eval {
- my $p = 'HEAD:'.mid2path($smsg->mid);
- Email::Simple->new($git->cat_file($p));
- };
- emit_msg($fh, $msg) if $msg;
- }
+ [200, ['Content-Type' => 'application/gzip'],
+ PublicInbox::MboxGz->new($ctx, $cb) ];
+}
- $opts{offset} += $nr;
- } while ($nr > 0);
+sub emit_range {
+ my ($ctx, $range) = @_;
- $fh->close;
+ eval { require IO::Compress::Gzip };
+ return sub { need_gzip(@_) } if $@;
+ my $query;
+ if ($range eq 'all') { # TODO: YYYY[-MM]
+ $query = '';
+ } else {
+ return [404, [qw(Content-Type text/plain)], []];
+ }
+ my $cb = sub { $ctx->{srch}->query($query, @_) };
+
+ # http://www.iana.org/assignments/media-types/application/gzip
+ [200, [qw(Content-Type application/gzip)],
+ PublicInbox::MboxGz->new($ctx, $cb) ];
}
sub need_gzip {
@@ -80,45 +99,57 @@ The administrator needs to install the IO::Compress::Gzip Perl module
to support gzipped mboxes.
Return to index