get rid of unnecessary bytes::length usage

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

diff --git a/lib/PublicInbox/ManifestJsGz.pm b/lib/PublicInbox/ManifestJsGz.pm
index fb7a45e733d084d6e47eeec056ffca6068c43f03..69d81fa1ace13dc634625e86abd4c15935c57230 100644 (file)
--- a/lib/PublicInbox/ManifestJsGz.pm
+++ b/lib/PublicInbox/ManifestJsGz.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # generates manifest.js.gz for grokmirror(1)
@@ -6,19 +6,17 @@ package PublicInbox::ManifestJsGz;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::WwwListing);
-use bytes (); # length
 use PublicInbox::Config;
 use IO::Compress::Gzip qw(gzip);
 use HTTP::Date qw(time2str);
 
-our $json = PublicInbox::Config::json();
+my $json = PublicInbox::Config::json();
 
-# called by WwwListing
-sub url_regexp {
+sub url_filter {
        my ($ctx) = @_;
        # grokmirror uses relative paths, so it's domain-dependent
-       # SUPER calls PublicInbox::WwwListing::url_regexp
-       $ctx->SUPER::url_regexp('publicInbox.grokManifest', 'match=domain');
+       # SUPER calls PublicInbox::WwwListing::url_filter
+       $ctx->SUPER::url_filter('publicInbox.grokManifest', 'match=domain');
 }
 
 sub inject_entry ($$$;$) {
@@ -29,7 +27,7 @@ sub inject_entry ($$$;$) {
        $ctx->{manifest}->{$url_path} = $ent;
 }
 
-sub manifest_add ($$;$$) {
+sub manifest_add ($$;$$) { # slow path w/o extindex "all"
        my ($ctx, $ibx, $epoch, $default_desc) = @_;
        my $url_path = "/$ibx->{name}";
        my $git;
@@ -61,6 +59,7 @@ sub eidx_manifest_add ($$$) {
        my ($ctx, $ALL, $ibx) = @_;
        if (my $data = $ALL->misc->inbox_data($ibx)) {
                $data = $json->decode($data);
+               delete $data->{''}; # private
                while (my ($url_path, $ent) = each %$data) {
                        inject_entry($ctx, $url_path, $ent);
                }
@@ -69,20 +68,33 @@ sub eidx_manifest_add ($$$) {
        }
 }
 
+sub response {
+       my ($class, $ctx) = @_;
+       bless $ctx, $class;
+       my ($re, undef) = $ctx->url_filter;
+       $re // return psgi_triple($ctx);
+       my $iter = PublicInbox::ConfigIter->new($ctx->{www}->{pi_cfg},
+                                       $ctx->can('list_match_i'), $re, $ctx);
+       sub {
+               $ctx->{-wcb} = $_[0]; # HTTP server callback
+               $ctx->{env}->{'pi-httpd.async'} ?
+                               $iter->event_step : $iter->each_section;
+       }
+}
+
 sub ibx_entry {
        my ($ctx, $ibx) = @_;
        my $ALL = $ctx->{www}->{pi_cfg}->ALL;
-       if ($ALL) {
+       if ($ALL) { # FIXME: test this in t/
                eidx_manifest_add($ctx, $ALL, $ibx);
        } else {
                slow_manifest_add($ctx, $ibx);
+               warn "E: $@" if $@;
        }
-       warn "E: $@" if $@;
 }
 
-sub hide_key { 'manifest' }
+sub hide_key { 'manifest' } # for WwwListing->list_match_i
 
-# overrides WwwListing->psgi_triple
 sub psgi_triple {
        my ($ctx) = @_;
        my $abs2urlpath = delete($ctx->{-abs2urlpath}) // {};
@@ -95,7 +107,14 @@ sub psgi_triple {
        gzip(\$manifest => \(my $out));
        [ 200, [ qw(Content-Type application/gzip),
                 'Last-Modified', time2str($ctx->{-mtime}),
-                'Content-Length', bytes::length($out) ], [ $out ] ]
+                'Content-Length', length($out) ], [ $out ] ]
+}
+
+sub per_inbox {
+       my ($ctx) = @_;
+       # only one inbox, slow is probably OK
+       slow_manifest_add($ctx, $ctx->{ibx});
+       psgi_triple($ctx);
 }
 
 1;