X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiDedupe.pm;h=32f99cd0a30c3eafeed64940c7a0bd21940861ad;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=3f478aa4a786ba3280344ec2c10de9f2beb015f7;hpb=9dfc0b670fc634b54998c3020f173b82de1915ac;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiDedupe.pm b/lib/PublicInbox/LeiDedupe.pm
index 3f478aa4..32f99cd0 100644
--- a/lib/PublicInbox/LeiDedupe.pm
+++ b/lib/PublicInbox/LeiDedupe.pm
@@ -3,8 +3,8 @@
 package PublicInbox::LeiDedupe;
 use strict;
 use v5.10.1;
-use PublicInbox::SharedKV;
-use PublicInbox::ContentHash qw(content_hash);
+use PublicInbox::ContentHash qw(content_hash git_sha);
+use Digest::SHA ();
 
 # n.b. mutt sets most of these headers not sure about Bytes
 our @OID_IGNORE = qw(Status X-Status Content-Length Lines Bytes);
@@ -18,12 +18,7 @@ sub _regen_oid ($) {
 		push @stash, [ $k, \@v ];
 		$eml->header_set($k); # restore below
 	}
-	my $dig = Digest::SHA->new(1); # XXX SHA256 later
-	my $buf = $eml->as_string;
-	$dig->add('blob '.length($buf)."\0");
-	$dig->add($buf);
-	undef $buf;
-
+	my $dig = git_sha(1, $eml);
 	for my $kv (@stash) { # restore stashed headers
 		my ($k, @v) = @$kv;
 		$eml->header_set($k, @v);
@@ -46,8 +41,8 @@ sub smsg_hash ($) {
 sub dedupe_oid ($) {
 	my ($skv) = @_;
 	(sub { # may be called in a child process
-		my ($eml, $oid) = @_;
-		$skv->set_maybe(_oidbin($oid) // _regen_oid($eml), '');
+		my ($eml, $oidhex) = @_;
+		$skv->set_maybe(_oidbin($oidhex) // _regen_oid($eml), '');
 	}, sub {
 		my ($smsg) = @_;
 		$skv->set_maybe(_oidbin($smsg->{blob}), '');
@@ -58,9 +53,9 @@ sub dedupe_oid ($) {
 sub dedupe_mid ($) {
 	my ($skv) = @_;
 	(sub { # may be called in a child process
-		my ($eml, $oid) = @_;
-		# TODO: lei will support non-public messages w/o Message-ID
-		my $mid = $eml->header_raw('Message-ID') // _oidbin($oid) //
+		my ($eml, $oidhex) = @_;
+		# lei supports non-public drafts w/o Message-ID
+		my $mid = $eml->header_raw('Message-ID') // _oidbin($oidhex) //
 			content_hash($eml);
 		$skv->set_maybe($mid, '');
 	}, sub {
@@ -76,7 +71,7 @@ sub dedupe_mid ($) {
 sub dedupe_content ($) {
 	my ($skv) = @_;
 	(sub { # may be called in a child process
-		my ($eml) = @_; # oid = $_[1], ignored
+		my ($eml) = @_; # $oidhex = $_[1], ignored
 		$skv->set_maybe(content_hash($eml), '');
 	}, sub {
 		my ($smsg) = @_;
@@ -97,17 +92,20 @@ sub new {
 	return if ($dd eq 'none' && substr($dst // '', -1) eq '/');
 	my $m = "dedupe_$dd";
 	$cls->can($m) or die "unsupported dedupe strategy: $dd\n";
-	my $skv = $dd eq 'none' ? undef : PublicInbox::SharedKV->new;
-
+	my $skv;
+	if ($dd ne 'none') {
+		require PublicInbox::SharedKV;
+		$skv = PublicInbox::SharedKV->new;
+	}
 	# [ $skv, $eml_cb, $smsg_cb, "dedupe_$dd" ]
 	bless [ $skv, undef, undef, $m ], $cls;
 }
 
-# returns true on unseen messages according to the deduplication strategy,
-# returns false if seen
+# returns true on seen messages according to the deduplication strategy,
+# returns false if unseen
 sub is_dup {
-	my ($self, $eml, $oid) = @_;
-	!$self->[1]->($eml, $oid);
+	my ($self, $eml, $smsg) = @_;
+	!$self->[1]->($eml, $smsg ? $smsg->{blob} : undef);
 }
 
 sub is_smsg_dup {
@@ -124,8 +122,14 @@ sub prepare_dedupe {
 
 sub pause_dedupe {
 	my ($self) = @_;
-	my $skv = $self->[0];
+	my $skv = $self->[0] or return;
+	$skv->dbh_release;
 	delete($skv->{dbh}) if $skv;
 }
 
+sub has_entries {
+	my $skv = $_[0]->[0] or return undef;
+	$skv->has_entries;
+}
+
 1;