hoist MailDiff and ContentDigestDbg out of lei

These will be reused in the web UI, too.

diff --git a/MANIFEST b/MANIFEST
index 565317ce5efde124f16ad32a84249fabfbb811d2..3626e4d23461b5a32a410ad86c46830b827593ed 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -163,6 +163,7 @@ lib/PublicInbox/CmdIPC4.pm
 lib/PublicInbox/CompressNoop.pm
 lib/PublicInbox/Config.pm
 lib/PublicInbox/ConfigIter.pm
+lib/PublicInbox/ContentDigestDbg.pm
 lib/PublicInbox/ContentHash.pm
 lib/PublicInbox/DS.pm
 lib/PublicInbox/DSKQXS.pm
@@ -280,6 +281,7 @@ lib/PublicInbox/Lock.pm
 lib/PublicInbox/MDA.pm
 lib/PublicInbox/MID.pm
 lib/PublicInbox/MIME.pm
+lib/PublicInbox/MailDiff.pm
 lib/PublicInbox/ManifestJsGz.pm
 lib/PublicInbox/Mbox.pm
 lib/PublicInbox/MboxGz.pm
@@ -478,6 +480,7 @@ t/lei-import.t
 t/lei-index.t
 t/lei-inspect.t
 t/lei-lcat.t
+t/lei-mail-diff.t
 t/lei-mirror.psgi
 t/lei-mirror.t
 t/lei-p2q.t

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

diff --git a/lib/PublicInbox/LeiMailDiff.pm b/lib/PublicInbox/LeiMailDiff.pm
index 2b4cfd9e102c9682b1093dc5ae9b25d2e1a9dfbb..c813144fb3af02f33c121caaa552e9676389abc2 100644 (file)
--- a/lib/PublicInbox/LeiMailDiff.pm
+++ b/lib/PublicInbox/LeiMailDiff.pm
@@ -4,59 +4,16 @@
 # The "lei mail-diff" sub-command, diffs input contents against
 # the first message of input
 package PublicInbox::LeiMailDiff;
-use strict;
-use v5.10.1;
-use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
-use File::Temp 0.19 (); # 0.19 for ->newdir
+use v5.12;
+use parent qw(PublicInbox::IPC PublicInbox::LeiInput PublicInbox::MailDiff);
 use PublicInbox::Spawn qw(spawn which);
-use PublicInbox::MsgIter qw(msg_part_text);
-use File::Path qw(remove_tree);
-use PublicInbox::ContentHash qw(content_digest);
+use File::Path ();
 require PublicInbox::LeiRediff;
-use Data::Dumper ();
-
-sub write_part { # Eml->each_part callback
-       my ($ary, $self) = @_;
-       my ($part, $depth, $idx) = @$ary;
-       if ($idx ne '1' || $self->{lei}->{opt}->{'raw-header'}) {
-               open my $fh, '>', "$self->{curdir}/$idx.hdr" or die "open: $!";
-               print $fh ${$part->{hdr}} or die "print $!";
-               close $fh or die "close $!";
-       }
-       my $ct = $part->content_type || 'text/plain';
-       my ($s, $err) = msg_part_text($part, $ct);
-       my $sfx = defined($s) ? 'txt' : 'bin';
-       open my $fh, '>', "$self->{curdir}/$idx.$sfx" or die "open: $!";
-       print $fh ($s // $part->body) or die "print $!";
-       close $fh or die "close $!";
-}
-
-sub dump_eml ($$$) {
-       my ($self, $dir, $eml) = @_;
-       local $self->{curdir} = $dir;
-       mkdir $dir or die "mkdir($dir): $!";
-       $eml->each_part(\&write_part, $self);
-
-       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: $!";
-}
-
-sub prep_a ($$) {
-       my ($self, $eml) = @_;
-       $self->{tmp} = File::Temp->newdir('lei-mail-diff-XXXX', TMPDIR => 1);
-       dump_eml($self, "$self->{tmp}/a", $eml);
-}
 
 sub diff_a ($$) {
        my ($self, $eml) = @_;
-       ++$self->{nr};
-       my $dir = "$self->{tmp}/N$self->{nr}";
-       dump_eml($self, $dir, $eml);
+       my $dir = "$self->{tmp}/N".(++$self->{nr});
+       $self->dump_eml($dir, $eml);
        my $cmd = [ qw(git diff --no-index) ];
        my $lei = $self->{lei};
        PublicInbox::LeiRediff::_lei_diff_prepare($lei, $cmd);
@@ -71,7 +28,7 @@ sub diff_a ($$) {
 
 sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
        my ($self, $eml) = @_;
-       $self->{tmp} ? diff_a($self, $eml) : prep_a($self, $eml);
+       $self->{tmp} ? diff_a($self, $eml) : $self->prep_a($eml);
 }
 
 sub lei_mail_diff {
@@ -82,24 +39,10 @@ sub lei_mail_diff {
        $lei->{opt}->{color} //= $isatty;
        $lei->start_pager if $isatty;
        $lei->{-err_type} = 'non-fatal';
+       $self->{-raw_hdr} = $lei->{opt}->{'raw-header'};
        $lei->wq1_start($self);
 }
 
 no warnings 'once';
 *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done;
-
-package PublicInbox::ContentDigestDbg; # cf. PublicInbox::ContentDigest
-use strict;
-use v5.10.1;
-use Data::Dumper;
-
-sub new { bless { dig => Digest::SHA->new(256), fh => $_[1] }, __PACKAGE__ }
-
-sub add {
-       $_[0]->{dig}->add($_[1]);
-       print { $_[0]->{fh} } Dumper([split(/^/sm, $_[1])]) or die "print $!";
-}
-
-sub hexdigest { $_[0]->{dig}->hexdigest; }
-
 1;

diff --git a/lib/PublicInbox/MailDiff.pm b/lib/PublicInbox/MailDiff.pm
new file mode 100644 (file)
index 0000000..06eb3a0
--- /dev/null
+++ b/lib/PublicInbox/MailDiff.pm
@@ -0,0 +1,50 @@
+# Copyright (C) all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+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);
+
+sub write_part { # Eml->each_part callback
+       my ($ary, $self) = @_;
+       my ($part, $depth, $idx) = @$ary;
+       if ($idx ne '1' || $self->{-raw_hdr}) {
+               open my $fh, '>', "$self->{curdir}/$idx.hdr" or die "open: $!";
+               print $fh ${$part->{hdr}} or die "print $!";
+               close $fh or die "close $!";
+       }
+       my $ct = $part->content_type || 'text/plain';
+       my ($s, $err) = msg_part_text($part, $ct);
+       my $sfx = defined($s) ? 'txt' : 'bin';
+       open my $fh, '>', "$self->{curdir}/$idx.$sfx" or die "open: $!";
+       print $fh ($s // $part->body) or die "print $!";
+       close $fh or die "close $!";
+}
+
+# public
+sub dump_eml ($$$) {
+       my ($self, $dir, $eml) = @_;
+       local $self->{curdir} = $dir;
+       mkdir $dir or die "mkdir($dir): $!";
+       $eml->each_part(\&write_part, $self);
+
+       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: $!";
+}
+
+# public
+sub prep_a ($$) {
+       my ($self, $eml) = @_;
+       $self->{tmp} = File::Temp->newdir('mail-diff-XXXX', TMPDIR => 1);
+       dump_eml($self, "$self->{tmp}/a", $eml);
+}
+
+1;

diff --git a/t/lei-mail-diff.t b/t/lei-mail-diff.t
new file mode 100644 (file)
index 0000000..9398596
--- /dev/null
+++ b/t/lei-mail-diff.t
@@ -0,0 +1,14 @@
+#!perl -w
+# Copyright (C) all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use v5.12; use PublicInbox::TestCommon;
+
+test_lei(sub {
+       ok(!lei('mail-diff', 't/data/0001.patch', 't/data/binary.patch'),
+               'different messages are different');
+       like($lei_out, qr/^\+/m, 'diff shown');
+       lei_ok('mail-diff', 't/data/0001.patch', 't/data/0001.patch');
+       is($lei_out, '', 'no output if identical');
+});
+
+done_testing;