mbox: do not barf on queries which return no results

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 2ea326a5a87fbf8788064e0be61819c8fe79b8da..04c86cc196515e345d36491b200a1d29f3e4bd17 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Streaming interface for formatting messages as an mboxrd.
 # Used by the web interface
@@ -101,17 +101,22 @@ sub thread_mbox {
 sub emit_range {
        my ($ctx, $range) = @_;
 
-       eval { require IO::Compress::Gzip };
-       return sub { need_gzip(@_) } if $@;
        my $query;
        if ($range eq 'all') { # TODO: YYYY[-MM]
                $query = '';
        } else {
                return [404, [qw(Content-Type text/plain)], []];
        }
+       mbox_all($ctx, $query);
+}
+
+sub mbox_all {
+       my ($ctx, $query) = @_;
 
+       eval { require IO::Compress::Gzip };
+       return sub { need_gzip(@_) } if $@;
        my $cb = sub { $ctx->{srch}->query($query, @_) };
-       PublicInbox::MboxGz->response($ctx, $cb);
+       PublicInbox::MboxGz->response($ctx, $cb, 'results-'.$query);
 }
 
 sub need_gzip {
@@ -131,6 +136,7 @@ EOF
 package PublicInbox::MboxGz;
 use strict;
 use warnings;
+use PublicInbox::Hval qw/to_filename/;
 
 sub new {
        my ($class, $ctx, $cb) = @_;
@@ -146,14 +152,27 @@ sub new {
 }
 
 sub response {
-       my ($class, $ctx, $cb) = @_;
+       my ($class, $ctx, $cb, $fn) = @_;
        my $body = $class->new($ctx, $cb);
        # http://www.iana.org/assignments/media-types/application/gzip
        $body->{hdr} = [ 'Content-Type', 'application/gzip' ];
-       my $hdr = $body->getline; # fill in Content-Disposition filename
+       $body->{fn} = $fn;
+       # fill in Content-Disposition filename
+       my $hdr = $body->getline;
+       if ($body->{hdr}) {
+               return [ 404, ['Content-Type','text/plain'],
+                       [ "No results found\n" ] ];
+       }
        [ 200, $hdr, $body ];
 }
 
+sub set_filename ($$) {
+       my ($fn, $msg) = @_;
+       return to_filename($fn) if defined($fn);
+
+       PublicInbox::Mbox::subject_fn($msg);
+}
+
 # called by Plack::Util::foreach or similar
 sub getline {
        my ($self) = @_;
@@ -170,7 +189,7 @@ sub getline {
 
                        # use subject of first message as subject
                        if (my $hdr = delete $self->{hdr}) {
-                               my $fn = PublicInbox::Mbox::subject_fn($msg);
+                               my $fn = set_filename($self->{fn}, $msg);
                                push @$hdr, 'Content-Disposition',
                                                "inline; filename=$fn.mbox.gz";
                                return $hdr;