content_digest_dbg: convert to arrayref and limit to lei

Since it's an extremely small class and not subclassed or
anything, we'll make it even smaller as an arrayref.

We also don't load this for PublicInbox::WWW or anything that
runs in public-facing daemons.

diff --git a/lib/PublicInbox/ContentDigestDbg.pm b/lib/PublicInbox/ContentDigestDbg.pm
index 899afbbe6f0ed30a1e5ee5c6a62875f0dc9b0389..5de0ee8ac3eb58d403a3b1bcf24d9920b0e4e4e5 100644 (file)
--- a/lib/PublicInbox/ContentDigestDbg.pm
+++ b/lib/PublicInbox/ContentDigestDbg.pm
@@ -1,17 +1,19 @@
 # Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+# only loaded in lei
 package PublicInbox::ContentDigestDbg; # cf. PublicInbox::ContentDigest
 use v5.12;
 use Data::Dumper;
 use PublicInbox::SHA;
+$Data::Dumper::Useqq = $Data::Dumper::Terse = 1;
 
-sub new { bless { dig => PublicInbox::SHA->new(256), fh => $_[1] }, __PACKAGE__ }
+sub new { bless [ PublicInbox::SHA->new(256), $_[1] ], __PACKAGE__ }
 
 sub add {
-       $_[0]->{dig}->add($_[1]);
-       print { $_[0]->{fh} } Dumper([split(/^/sm, $_[1])]) or die "print $!";
+       $_[0]->[0]->add($_[1]);
+       print { $_[0]->[1] } Dumper([split(/^/sm, $_[1])]) or die "print $!";
 }
 
-sub hexdigest { $_[0]->{dig}->hexdigest; }
+sub hexdigest { $_[0]->[0]->hexdigest }
 
 1;

diff --git a/lib/PublicInbox/MailDiff.pm b/lib/PublicInbox/MailDiff.pm
index 0ed06f9a25269350a30c268deaaa2ba67fe79d06..a0ecef9fbdd75634809b35a58eccd657a4f7ba6b 100644 (file)
--- a/lib/PublicInbox/MailDiff.pm
+++ b/lib/PublicInbox/MailDiff.pm
@@ -4,8 +4,6 @@ package PublicInbox::MailDiff;
 use v5.12;
 use File::Temp 0.19 (); # 0.19 for ->newdir
 use PublicInbox::ContentHash qw(content_digest);
-use PublicInbox::ContentDigestDbg;
-use Data::Dumper ();
 use PublicInbox::MsgIter qw(msg_part_text);
 use PublicInbox::ViewDiff qw(flush_diff);
 use PublicInbox::GitAsyncCat;
@@ -34,12 +32,11 @@ sub dump_eml ($$$) {
        $eml->each_part(\&write_part, $self);
 
        return if $self->{ctx}; # don't need content_digest noise in WWW UI
+       require PublicInbox::ContentDigestDbg;
 
        # XXX is this even useful?  perhaps hide it behind a CLI switch
        open my $fh, '>', "$dir/content_digest" or die "open: $!";
        my $dig = PublicInbox::ContentDigestDbg->new($fh);
-       local $Data::Dumper::Useqq = 1;
-       local $Data::Dumper::Terse = 1;
        content_digest($eml, $dig);
        print $fh "\n", $dig->hexdigest, "\n" or die "print $!";
        close $fh or die "close: $!";