inbox: base_url method takes PSGI env hashref instead

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 40ca61146b53d12af17cf2ad0fb746f58c92c87e..9dad0f6da25dc0c28c26484e1254b81dabafbaeb 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -12,19 +12,14 @@ use Plack::Util;
 require Email::Simple;
 
 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($ctx, $fh, $simple);
-               $fh->close;
-       }
+       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 ($ctx, $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
@@ -32,22 +27,18 @@ sub emit_msg {
        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 $ibx = $ctx->{-inbox};
+       my $base = $ibx->base_url($ctx->{env});
        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', "<mailto:$feed_opts->{id_addr}>",
+               'List-Post', "<mailto:$ibx->{-primary_address}>",
        );
-       my $append = '';
        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];
@@ -58,27 +49,18 @@ sub emit_msg {
                                last;
                        }
                }
-               $append .= "$k: $v$crlf" if defined $v;
-       }
-       my $buf = $header_obj->as_string;
-       unless ($buf =~ /\AFrom /) {
-               $fh->write("From mboxrd\@z Thu Jan  1 00:00:00 1970\n");
+               $buf .= "$k: $v$crlf" if defined $v;
        }
-       $append .= $crlf;
-       $fh->write($buf .= $append);
-
-       $buf = $simple->body;
-       $simple->body_set('');
+       $buf .= $crlf;
 
        # mboxrd quoting style
        # ref: http://www.qmail.org/man/man5/mbox.html
-       $buf =~ s/^(>*From )/>$1/gm;
-
-       $fh->write($buf .= "\n");
+       my $body = $simple->body;
+       $body =~ s/^(>*From )/>$1/gm;
+       $buf .= $body;
+       $buf .= "\n";
 }
 
-sub noop {}
-
 sub thread_mbox {
        my ($ctx, $srch, $sfx) = @_;
        eval { require IO::Compress::Gzip };
@@ -125,14 +107,13 @@ EOF
 package PublicInbox::MboxGz;
 use strict;
 use warnings;
-use PublicInbox::MID qw(mid2path);
 
 sub new {
        my ($class, $ctx, $cb) = @_;
-       my $buf;
+       my $buf = '';
        bless {
                buf => \$buf,
-               gz => IO::Compress::Gzip->new(\$buf),
+               gz => IO::Compress::Gzip->new(\$buf, Time => 0),
                cb => $cb,
                ctx => $ctx,
                msgs => [],
@@ -140,39 +121,33 @@ sub new {
        }, $class;
 }
 
-sub _flush_buf {
-       my ($self) = @_;
-       my $ret = $self->{buf};
-       $ret = $$ret;
-       ${$self->{buf}} = undef;
-       $ret;
-}
-
 # called by Plack::Util::foreach or similar
 sub getline {
        my ($self) = @_;
+       my $ctx = $self->{ctx} or return;
        my $res;
-       my $ctx = $self->{ctx};
-       my $git = $ctx->{git};
+       my $ibx = $ctx->{-inbox};
+       my $gz = $self->{gz};
        do {
                while (defined(my $smsg = shift @{$self->{msgs}})) {
-                       my $msg = eval {
-                               my $p = 'HEAD:'.mid2path($smsg->mid);
-                               Email::Simple->new($git->cat_file($p));
-                       };
-                       $msg or next;
-
-                       PublicInbox::Mbox::emit_msg($ctx, $self->{gz}, $msg);
-                       my $ret = _flush_buf($self);
-                       return $ret if $ret;
+                       my $msg = eval { $ibx->msg_by_mid($smsg->mid) } or next;
+                       $msg = Email::Simple->new($msg);
+                       $gz->write(PublicInbox::Mbox::msg_str($ctx, $msg));
+                       my $bref = $self->{buf};
+                       if (length($$bref) >= 8192) {
+                               my $ret = $$bref; # copy :<
+                               ${$self->{buf}} = '';
+                               return $ret;
+                       }
                }
                $res = $self->{cb}->($self->{opts});
                $self->{msgs} = $res->{msgs};
                $res = scalar @{$self->{msgs}};
                $self->{opts}->{offset} += $res;
        } while ($res);
-       $self->{gz}->close;
-       _flush_buf($self);
+       $gz->close;
+       delete $self->{ctx};
+       ${delete $self->{buf}};
 }
 
 sub close {} # noop