* [PATCH 5/7] mbox: avoid write dependency for streaming
2016-06-20 0:57 7% [PATCH 0/7] www: various feed/streaming related cleanups Eric Wong
@ 2016-06-20 0:57 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-06-20 0:57 UTC (permalink / raw)
To: meta
Prefer to return strings instead, so Content-Length can be
calculated for caching and such.
---
lib/PublicInbox/Mbox.pm | 47 +++++++++++++++++------------------------------
1 file changed, 17 insertions(+), 30 deletions(-)
diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 1c792c8..0258d8c 100644
--- 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
@@ -41,8 +36,9 @@ sub emit_msg {
'List-Archive', "<$base>",
'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];
@@ -53,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 };
@@ -149,6 +136,7 @@ sub getline {
my $res;
my $ctx = $self->{ctx};
my $git = $ctx->{git};
+ my $gz = $self->{gz};
do {
while (defined(my $smsg = shift @{$self->{msgs}})) {
my $msg = eval {
@@ -156,8 +144,7 @@ sub getline {
Email::Simple->new($git->cat_file($p));
};
$msg or next;
-
- PublicInbox::Mbox::emit_msg($ctx, $self->{gz}, $msg);
+ $gz->write(PublicInbox::Mbox::msg_str($ctx, $msg));
my $ret = _flush_buf($self);
return $ret if $ret;
}
@@ -166,7 +153,7 @@ sub getline {
$res = scalar @{$self->{msgs}};
$self->{opts}->{offset} += $res;
} while ($res);
- $self->{gz}->close;
+ $gz->close;
_flush_buf($self);
}
^ permalink raw reply related [relevance 6%]
* [PATCH 0/7] www: various feed/streaming related cleanups
@ 2016-06-20 0:57 7% Eric Wong
2016-06-20 0:57 6% ` [PATCH 5/7] mbox: avoid write dependency for streaming Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-06-20 0:57 UTC (permalink / raw)
To: meta
Yet more progress towards converting our PSGI streaming
interfaces over to getline/close so it can be pull-based.
Eric Wong (7):
MANIFEST: update with recent changes
feed: avoid needless method dispatches on 404
feed: remove dependence on fh->write for streaming
mbox: remove feed dependency
mbox: avoid write dependency for streaming
feed: various object-orientation cleanups
inbox: move field population logic to initializer
.gitignore | 1 +
MANIFEST | 2 +
Makefile.PL | 5 ++-
lib/PublicInbox/Config.pm | 4 +-
lib/PublicInbox/Feed.pm | 99 ++++++++++++++++++-------------------------
lib/PublicInbox/Inbox.pm | 15 +++++++
lib/PublicInbox/Mbox.pm | 68 ++++++++++-------------------
lib/PublicInbox/NNTP.pm | 6 +--
lib/PublicInbox/SearchView.pm | 3 +-
lib/PublicInbox/View.pm | 7 +--
lib/PublicInbox/WWW.pm | 4 +-
lib/PublicInbox/WwwAttach.pm | 5 +--
t/feed.t | 44 ++++++-------------
t/html_index.t | 11 ++++-
14 files changed, 119 insertions(+), 155 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-06-20 0:57 7% [PATCH 0/7] www: various feed/streaming related cleanups Eric Wong
2016-06-20 0:57 6% ` [PATCH 5/7] mbox: avoid write dependency for streaming Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).