mbox: split mboxgz out into a separate file

It'll make using Compress::Raw::Zlib easier, since we
can use that and import constants more easily.

diff --git a/MANIFEST b/MANIFEST
index ef8538b4e7a798380d13cd0069d25f333b470825..689d3d4ee21fb5fcc7ebec07ea206de6dc2de381 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -119,6 +119,7 @@ lib/PublicInbox/MDA.pm
 lib/PublicInbox/MID.pm
 lib/PublicInbox/MIME.pm
 lib/PublicInbox/Mbox.pm
+lib/PublicInbox/MboxGz.pm
 lib/PublicInbox/MsgIter.pm
 lib/PublicInbox/MsgTime.pm
 lib/PublicInbox/Msgmap.pm

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 9e808c09502064e57642cf2f1c7e7e401d387a4e..42ed8c5d9f2c1decbbcc71617d65ff65af644739 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -136,7 +136,7 @@ sub msg_body ($) {
 
 sub thread_mbox {
        my ($ctx, $over, $sfx) = @_;
-       eval { require IO::Compress::Gzip };
+       eval { require PublicInbox::MboxGz };
        return sub { need_gzip(@_) } if $@;
        my $mid = $ctx->{mid};
        my $msgs = $over->get_thread($mid, {});
@@ -196,7 +196,7 @@ sub mbox_all_ids {
 sub mbox_all {
        my ($ctx, $query) = @_;
 
-       eval { require IO::Compress::Gzip };
+       eval { require PublicInbox::MboxGz };
        return sub { need_gzip(@_) } if $@;
        return mbox_all_ids($ctx) if $query eq '';
        my $opts = { mset => 2 };
@@ -239,63 +239,3 @@ EOF
 }
 
 1;
-
-package PublicInbox::MboxGz;
-use strict;
-use warnings;
-use PublicInbox::Hval qw/to_filename/;
-
-sub new {
-       my ($class, $ctx, $cb) = @_;
-       my $buf = '';
-       $ctx->{base_url} = $ctx->{-inbox}->base_url($ctx->{env});
-       bless {
-               buf => \$buf,
-               gz => IO::Compress::Gzip->new(\$buf, Time => 0),
-               cb => $cb,
-               ctx => $ctx,
-       }, $class;
-}
-
-sub response {
-       my ($class, $ctx, $cb, $fn) = @_;
-       my $body = $class->new($ctx, $cb);
-       # http://www.iana.org/assignments/media-types/application/gzip
-       my @h = qw(Content-Type application/gzip);
-       if ($fn) {
-               $fn = to_filename($fn);
-               push @h, 'Content-Disposition', "inline; filename=$fn.mbox.gz";
-       }
-       [ 200, \@h, $body ];
-}
-
-# called by Plack::Util::foreach or similar
-sub getline {
-       my ($self) = @_;
-       my $ctx = $self->{ctx} or return;
-       my $gz = $self->{gz};
-       while (my $smsg = $self->{cb}->()) {
-               my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
-               my $h = Email::Simple->new($mref)->header_obj;
-               $gz->write(PublicInbox::Mbox::msg_hdr($ctx, $h, $smsg->{mid}));
-               $gz->write(PublicInbox::Mbox::msg_body($$mref));
-
-               my $bref = $self->{buf};
-               if (length($$bref) >= 8192) {
-                       my $ret = $$bref; # copy :<
-                       ${$self->{buf}} = '';
-                       return $ret;
-               }
-
-               # be fair to other clients on public-inbox-httpd:
-               return '';
-       }
-       delete($self->{gz})->close;
-       # signal that we're done and can return undef next call:
-       delete $self->{ctx};
-       ${delete $self->{buf}};
-}
-
-sub close {} # noop
-
-1;

diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm
new file mode 100644 (file)
index 0000000..2919ad6
--- /dev/null
+++ b/lib/PublicInbox/MboxGz.pm
@@ -0,0 +1,64 @@
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+package PublicInbox::MboxGz;
+use strict;
+use warnings;
+use Email::Simple;
+use PublicInbox::Hval qw/to_filename/;
+use PublicInbox::Mbox;
+use IO::Compress::Gzip;
+
+sub new {
+       my ($class, $ctx, $cb) = @_;
+       my $buf = '';
+       $ctx->{base_url} = $ctx->{-inbox}->base_url($ctx->{env});
+       bless {
+               buf => \$buf,
+               gz => IO::Compress::Gzip->new(\$buf, Time => 0),
+               cb => $cb,
+               ctx => $ctx,
+       }, $class;
+}
+
+sub response {
+       my ($class, $ctx, $cb, $fn) = @_;
+       my $body = $class->new($ctx, $cb);
+       # http://www.iana.org/assignments/media-types/application/gzip
+       my @h = qw(Content-Type application/gzip);
+       if ($fn) {
+               $fn = to_filename($fn);
+               push @h, 'Content-Disposition', "inline; filename=$fn.mbox.gz";
+       }
+       [ 200, \@h, $body ];
+}
+
+# called by Plack::Util::foreach or similar
+sub getline {
+       my ($self) = @_;
+       my $ctx = $self->{ctx} or return;
+       my $gz = $self->{gz};
+       while (my $smsg = $self->{cb}->()) {
+               my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
+               my $h = Email::Simple->new($mref)->header_obj;
+               $gz->write(PublicInbox::Mbox::msg_hdr($ctx, $h, $smsg->{mid}));
+               $gz->write(PublicInbox::Mbox::msg_body($$mref));
+
+               my $bref = $self->{buf};
+               if (length($$bref) >= 8192) {
+                       my $ret = $$bref; # copy :<
+                       ${$self->{buf}} = '';
+                       return $ret;
+               }
+
+               # be fair to other clients on public-inbox-httpd:
+               return '';
+       }
+       delete($self->{gz})->close;
+       # signal that we're done and can return undef next call:
+       delete $self->{ctx};
+       ${delete $self->{buf}};
+}
+
+sub close {} # noop
+
+1;