lei up: fix dedupe with remote externals on Maildir + IMAP

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

diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm
index 79125214a06fdcc5dd6fafd08b6978c2ed786f55..92ced28bd9a48114456d5b1c88e872ca132c2b6a 100644 (file)
--- a/lib/PublicInbox/LeiSavedSearch.pm
+++ b/lib/PublicInbox/LeiSavedSearch.pm
@@ -170,23 +170,24 @@ sub cfg_set { # called by LeiXSearch
 sub is_dup {
        my ($self, $eml, $smsg) = @_;
        my $oidx = $self->{oidx} // die 'BUG: no {oidx}';
-       my $blob = $smsg ? $smsg->{blob} : undef;
-       my $lk = $self->lock_for_scope_fast;
-       return 1 if $blob && $oidx->blob_exists($blob);
+       my $lk;
        if ($self->{-dedupe_mid}) {
+               $lk //= $self->lock_for_scope_fast;
                for my $mid (@{mids_for_index($eml)}) {
                        my ($id, $prv);
                        return 1 if $oidx->next_by_mid($mid, \$id, \$prv);
                }
        }
+       my $blob = $smsg ? $smsg->{blob} : git_sha(1, $eml)->hexdigest;
+       $lk //= $self->lock_for_scope_fast;
+       return 1 if $oidx->blob_exists($blob);
        if (my $xoids = PublicInbox::LeiSearch::xoids_for($self, $eml, 1)) {
                for my $docid (values %$xoids) {
                        $oidx->add_xref3($docid, -1, $blob, '.');
                }
                $oidx->commit_lazy;
                if ($self->{-dedupe_oid}) {
-                       $smsg->{blob} //= git_sha(1, $eml)->hexdigest;
-                       exists $xoids->{$smsg->{blob}} ? 1 : undef;
+                       exists $xoids->{$blob} ? 1 : undef;
                } else {
                        1;
                }
@@ -197,11 +198,11 @@ sub is_dup {
                        $smsg->{bytes} = 0;
                        $smsg->populate($eml);
                }
+               $smsg->{blob} //= $blob;
                $oidx->begin_lazy;
                $smsg->{num} = $oidx->adj_counter('eidx_docid', '+');
-               $smsg->{blob} //= git_sha(1, $eml)->hexdigest;
                $oidx->add_overview($eml, $smsg);
-               $oidx->add_xref3($smsg->{num}, -1, $smsg->{blob}, '.');
+               $oidx->add_xref3($smsg->{num}, -1, $blob, '.');
                $oidx->commit_lazy;
                undef;
        }
@@ -259,6 +260,57 @@ sub output2lssdir {
        undef;
 }
 
+sub edit_begin {
+       my ($self, $lei) = @_;
+       if (ref($self->{-cfg}->{'lei.q.output'})) {
+               delete $self->{-cfg}->{'lei.q.output'}; # invalid
+               $lei->err(<<EOM);
+$self->{-f} has multiple values of lei.q.output
+please remove redundant ones
+EOM
+       }
+       $lei->{-lss_for_edit} = $self;
+}
+
+sub edit_done {
+       my ($self, $lei) = @_;
+       my $cfg = PublicInbox::Config->git_config_dump($self->{'-f'});
+       my $new_out = $cfg->{'lei.q.output'} // '';
+       return $lei->fail(<<EOM) if ref $new_out;
+$self->{-f} has multiple values of lei.q.output
+please edit again
+EOM
+       return $lei->fail(<<EOM) if $new_out eq '';
+$self->{-f} needs lei.q.output
+please edit again
+EOM
+       my $old_out = $self->{-cfg}->{'lei.q.output'} // '';
+       return if $old_out eq $new_out;
+       my $old_path = $old_out;
+       my $new_path = $new_out;
+       s!$LOCAL_PFX!! for ($old_path, $new_path);
+       my $dir_old = lss_dir_for($lei, \$old_path, 1);
+       my $dir_new = lss_dir_for($lei, \$new_path);
+       return if $dir_new eq $dir_old; # no change, likely
+       return $lei->fail(<<EOM) if -e $dir_new;
+lei.q.output changed from `$old_out' to `$new_out'
+However, $dir_new exists
+EOM
+       # start the conversion asynchronously
+       my $old_sq = PublicInbox::Config::squote_maybe($old_out);
+       my $new_sq = PublicInbox::Config::squote_maybe($new_out);
+       $lei->puts("lei.q.output changed from $old_sq to $new_sq");
+       $lei->qerr("# lei convert $old_sq -o $new_sq");
+       my $v = !$lei->{opt}->{quiet};
+       $lei->{opt} = { output => $new_out, verbose => $v };
+       require PublicInbox::LeiConvert;
+       PublicInbox::LeiConvert::lei_convert($lei, $old_out);
+
+       $lei->fail(<<EOM) if -e $dir_old && !rename($dir_old, $dir_new);
+E: rename($dir_old, $dir_new) error: $!
+EOM
+}
+
 no warnings 'once';
 *nntp_url = \&cloneurl;
 *base_url = \&PublicInbox::Inbox::base_url;