switch read-only Email::Simple users to Eml

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

diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm
index 2b873451e585945f8939df08eaabd47cc02030db..f7fc4afc147fab95da0df4f4ce483f78f942fa68 100644 (file)
--- a/lib/PublicInbox/MboxGz.pm
+++ b/lib/PublicInbox/MboxGz.pm
@@ -1,12 +1,11 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 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::Eml;
 use PublicInbox::Hval qw/to_filename/;
 use PublicInbox::Mbox;
-use IO::Compress::Gzip;
 use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
 my %OPT = (-WindowBits => 15 + 16, -AppendOutput => 1);
 
@@ -22,12 +21,10 @@ 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 (defined $fn && $fn ne '') {
-               $fn = to_filename($fn);
-               push @h, 'Content-Disposition', "inline; filename=$fn.mbox.gz";
-       }
-       [ 200, \@h, $body ];
+       $fn = defined($fn) && $fn ne '' ? to_filename($fn) : 'no-subject';
+       my $h = [ qw(Content-Type application/gzip),
+               'Content-Disposition', "inline; filename=$fn.mbox.gz" ];
+       [ 200, $h, $body ];
 }
 
 sub gzip_fail ($$) {
@@ -44,7 +41,7 @@ sub getline {
        my $buf = delete($self->{buf});
        while (my $smsg = $self->{cb}->($ctx)) {
                my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
-               my $h = Email::Simple->new($mref)->header_obj;
+               my $h = PublicInbox::Eml->new($mref)->header_obj;
 
                my $err = $gz->deflate(
                        PublicInbox::Mbox::msg_hdr($ctx, $h, $smsg->{mid}),