]> Sergey Matveev's repositories - public-inbox.git/commitdiff
wwwtext: simplify gzf_maybe use
authorEric Wong <e@yhbt.net>
Sun, 5 Jul 2020 23:27:55 +0000 (23:27 +0000)
committerEric Wong <e@yhbt.net>
Mon, 6 Jul 2020 20:01:15 +0000 (20:01 +0000)
gzf_maybe always returns a GzipFilter object, even if it uses
CompressNoop.  We can also use ->zflush instead of
->translate(undef) here for the final bit.

lib/PublicInbox/WwwText.pm

index 08691684d99ea5f9fad132ce10e0131f1fbbc752..a691e2d8efd5671770d8992d34e1f42c4feeb7ed 100644 (file)
@@ -38,16 +38,13 @@ sub get_text {
        }
        my $env = $ctx->{env};
        if ($raw) {
-               my $body;
-               if (my $gzf = $code == 200 ? gzf_maybe($hdr, $env) : undef) {
-                       my $zbuf = $gzf->translate($txt);
-                       undef $txt;
-                       $body = [ $zbuf .= $gzf->translate(undef) ];
-               } else {
-                       $body = [ $txt ];
+               if ($code == 200) {
+                       my $gzf = gzf_maybe($hdr, $env);
+                       $txt = $gzf->translate($txt);
+                       $txt .= $gzf->zflush;
                }
-               $hdr->[3] = bytes::length($body->[0]);
-               return [ $code, $hdr, $body ]
+               $hdr->[3] = bytes::length($txt);
+               return [ $code, $hdr, [ $txt ] ]
        }
 
        # enforce trailing slash for "wget -r" compatibility