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;
sub write_part { # Eml->each_part callback
my ($ary, $self) = @_;
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 $!";
+ $s //= $part->body;
+ $s =~ s/\r+\n/\n/sg;
+ open my $fh, '>:utf8', "$self->{curdir}/$idx.$sfx" or die "open: $!";
+ print $fh $s or die "print $!";
close $fh or die "close $!";
}
mkdir $dir or die "mkdir($dir): $!";
$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: $!";
dump_eml($self, "$self->{tmp}/a", $eml);
}
+sub next_smsg ($) {
+ my ($self) = @_;
+ my $ctx = $self->{ctx};
+ my $over = $ctx->{ibx}->over;
+ $self->{smsg} = $over ? $over->next_by_mid(@{$self->{next_arg}})
+ : $ctx->gone('over');
+ if (!$self->{smsg}) {
+ $ctx->write($ctx->_html_end);
+ return $ctx->close;
+ }
+ my $async = $self->{ctx}->{env}->{'pi-httpd.async'};
+ $async->(undef, undef, $self) if $async # PublicInbox::HTTPD::Async->new
+}
+
+sub emit_msg_diff {
+ my ($bref, $self) = @_; # bref is `git diff' output
+ # will be escaped to `•' in HTML
+ utf8::decode($$bref);
+ $self->{ctx}->{ibx}->{obfuscate} and
+ obfuscate_addrs($self->{ctx}->{ibx}, $$bref, "\x{2022}");
+ print { $self->{ctx}->{zfh} } '</pre><hr><pre>' if $self->{nr} > 1;
+ flush_diff($self->{ctx}, $bref);
+ next_smsg($self);
+}
+
+sub do_diff {
+ my ($self, $eml) = @_;
+ my $n = 'N'.(++$self->{nr});
+ my $dir = "$self->{tmp}/$n";
+ $self->dump_eml($dir, $eml);
+ my $cmd = [ qw(git diff --no-index --no-color -- a), $n ];
+ my $opt = { -C => "$self->{tmp}", quiet => 1 };
+ my $qsp = PublicInbox::Qspawn->new($cmd, undef, $opt);
+ $qsp->psgi_qx($self->{ctx}->{env}, undef, \&emit_msg_diff, $self);
+}
+
+sub diff_msg_i {
+ my ($self, $eml) = @_;
+ if ($eml) {
+ if ($self->{tmp}) { # 2nd..last message
+ do_diff($self, $eml);
+ } else { # first message:
+ prep_a($self, $eml);
+ next_smsg($self);
+ }
+ } else {
+ warn "W: $self->{smsg}->{blob} missing\n";
+ next_smsg($self);
+ }
+}
+
+sub diff_msg_i_async {
+ my ($bref, $oid, $type, $size, $self) = @_;
+ diff_msg_i($self, $bref ? PublicInbox::Eml->new($bref) : undef);
+}
+
+sub event_step {
+ my ($self) = @_;
+ eval {
+ my $ctx = $self->{ctx};
+ if ($ctx->{env}->{'pi-httpd.async'}) {
+ ibx_async_cat($ctx->{ibx}, $self->{smsg}->{blob},
+ \&diff_msg_i_async, $self);
+ } else {
+ diff_msg_i($self, $ctx->{ibx}->smsg_eml($self->{smsg}));
+ }
+ };
+ if ($@) {
+ warn "E: $@";
+ delete $self->{smsg};
+ $self->{ctx}->close;
+ }
+}
+
+sub begin_mail_diff {
+ my ($self) = @_;
+ if (my $async = $self->{ctx}->{env}->{'pi-httpd.async'}) {
+ $async->(undef, undef, $self); # PublicInbox::HTTPD::Async->new
+ } else {
+ event_step($self) while $self->{smsg};
+ }
+}
+
1;