X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMbox.pm;h=1c97f959c84502f6529310af2b5f6704f4858c30;hb=2c69f7bc34a2b12dc7f55e2bb24fa28565f24f03;hp=4c4b74fbc50c671e9ec201b8852b03b0686a8206;hpb=1269631ae596b910b7c26890c3efa9f85301a89b;p=public-inbox.git

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 4c4b74fb..1c97f959 100644
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -6,32 +6,20 @@
 package PublicInbox::Mbox;
 use strict;
 use warnings;
-use PublicInbox::MID qw/mid2path mid_clean/;
+use PublicInbox::MID qw/mid_clean/;
 use URI::Escape qw/uri_escape_utf8/;
+use Plack::Util;
 require Email::Simple;
 
-sub thread_mbox {
-	my ($ctx, $srch, $sfx) = @_;
-	sub {
-		my ($response) = @_; # Plack callback
-		emit_mbox($response, $ctx, $srch, $sfx);
-	}
-}
-
 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
@@ -39,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->{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', "<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];
@@ -65,123 +49,45 @@ sub emit_msg {
 				last;
 			}
 		}
-		$append .= "$k: $v$crlf" if defined $v;
+		$buf .= "$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");
-	}
-	$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 emit_mbox {
-	my ($response, $ctx, $srch, $sfx) = @_;
-	my $type = 'mbox';
-	if ($sfx) {
-		eval { require IO::Compress::Gzip };
-		return need_gzip($response) if $@;
-		$type = 'gzip';
-	}
+sub thread_mbox {
+	my ($ctx, $srch, $sfx) = @_;
+	eval { require IO::Compress::Gzip };
+	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/$type"]]);
-	$fh = PublicInbox::MboxGz->new($fh) if $sfx;
-
-	require PublicInbox::Git;
-	my $mid = $ctx->{mid};
-	my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
-	my %opts = (offset => 0, asc => 1);
-	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($ctx, $fh, $msg) if $msg;
-		}
-
-		$opts{offset} += $nr;
-	} while ($nr > 0);
-
-	$fh->close;
+	[200, ['Content-Type' => 'application/gzip'],
+		PublicInbox::MboxGz->new($ctx, $cb) ];
 }
 
 sub emit_range {
 	my ($ctx, $range) = @_;
-	sub { _emit_range($_[0], $ctx, $range) };
-}
-
-sub _emit_range {
-	my ($res, $ctx, $range) = @_;
 
 	eval { require IO::Compress::Gzip };
-	return need_gzip($res) if $@;
+	return sub { need_gzip(@_) } if $@;
 	my $query;
 	if ($range eq 'all') { # TODO: YYYY[-MM]
 		$query = '';
 	} else {
-		$res->([404, [qw(Content-Type text/plain)], []]);
-		return;
+		return [404, [qw(Content-Type text/plain)], []];
 	}
+	my $cb = sub { $ctx->{srch}->query($query, @_) };
 
 	# http://www.iana.org/assignments/media-types/application/gzip
-	my $fh = $res->([200, [qw(Content-Type application/gzip)]]);
-	$fh = PublicInbox::MboxGz->new($fh);
-	my $env = $ctx->{cgi}->env;
-	my $srch = $ctx->{srch};
-	my $git = $ctx->{git};
-	my %opts = (offset => 0, asc => 1);
-	my $nr;
-	my $cb = sub {
-		my $res = $srch->query($query, \%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($ctx, $fh, $msg) if $msg;
-		}
-
-		$opts{offset} += $nr;
-	};
-
-	$cb->(); # first part is free
-	return $fh->close if $nr == 0;
-
-	if ($env->{'pi-httpd.async'}) {
-		my $io = $env->{'psgix.io'} or die "no IO";
-		my $next;
-		$next = sub {
-			$cb->();
-			if ($nr > 0) {
-				$io->write($next);
-			} else {
-				$next = undef;
-				$fh->close;
-			}
-		};
-		$io->write($next); # Danga::Socket::write
-		return;
-	}
-	$cb->() while ($nr > 0);
-	$fh->close;
+	[200, [qw(Content-Type application/gzip)],
+		PublicInbox::MboxGz->new($ctx, $cb) ];
 }
 
 sub need_gzip {
@@ -198,40 +104,52 @@ EOF
 
 1;
 
-# fh may not be a proper IO, so we wrap the write and close methods
-# to prevent IO::Compress::Gzip from complaining
 package PublicInbox::MboxGz;
 use strict;
 use warnings;
 
 sub new {
-	my ($class, $fh) = @_;
-	my $buf;
+	my ($class, $ctx, $cb) = @_;
+	my $buf = '';
 	bless {
 		buf => \$buf,
-		gz => IO::Compress::Gzip->new(\$buf),
-		fh => $fh,
+		gz => IO::Compress::Gzip->new(\$buf, Time => 0),
+		cb => $cb,
+		ctx => $ctx,
+		msgs => [],
+		opts => { asc => 1, offset => 0 },
 	}, $class;
 }
 
-sub _flush_buf {
+# called by Plack::Util::foreach or similar
+sub getline {
 	my ($self) = @_;
-	if (defined ${$self->{buf}}) {
-		$self->{fh}->write(${$self->{buf}});
-		${$self->{buf}} = undef;
-	}
-}
-
-sub write {
-	$_[0]->{gz}->write($_[1]);
-	_flush_buf($_[0]);
+	my $ctx = $self->{ctx} or return;
+	my $res;
+	my $ibx = $ctx->{-inbox};
+	my $gz = $self->{gz};
+	do {
+		while (defined(my $smsg = shift @{$self->{msgs}})) {
+			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);
+	$gz->close;
+	delete $self->{ctx};
+	${delete $self->{buf}};
 }
 
-sub close {
-	my ($self) = @_;
-	$self->{gz}->close;
-	_flush_buf($self);
-	$self->{fh}->close;
-}
+sub close {} # noop
 
 1;