X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiRefreshMailSync.pm;h=a60a9a5e9761ca2ca89320adfd121d291b070e8b;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=cdd997253a609dc5871bdb7e9b17c88aa1468bce;hpb=7b7939d47b336fb7d8c4387858e620dbc218bb1e;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiRefreshMailSync.pm b/lib/PublicInbox/LeiRefreshMailSync.pm
index cdd99725..a60a9a5e 100644
--- a/lib/PublicInbox/LeiRefreshMailSync.pm
+++ b/lib/PublicInbox/LeiRefreshMailSync.pm
@@ -7,13 +7,13 @@ package PublicInbox::LeiRefreshMailSync;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
-use PublicInbox::LeiExportKw;
+use PublicInbox::LeiImport;
 use PublicInbox::InboxWritable qw(eml_from_path);
 use PublicInbox::Import;
 
-sub folder_missing {
+sub folder_missing { # may be called by LeiInput
 	my ($self, $folder) = @_;
-	$self->{lei}->{sto}->ipc_do('lms_forget_folders', $folder);
+	$self->{lms}->forget_folders($folder);
 }
 
 sub prune_mdir { # lms->each_src callback
@@ -21,13 +21,13 @@ sub prune_mdir { # lms->each_src callback
 	my @try = $$id =~ /:2,[a-zA-Z]*\z/ ? qw(cur new) : qw(new cur);
 	for (@try) { return if -f "$mdir/$_/$$id" }
 	# both tries failed
-	$self->{lei}->{sto}->ipc_do('lms_clear_src', "maildir:$mdir", $id);
+	$self->{lms}->clear_src("maildir:$mdir", $id);
 }
 
 sub prune_imap { # lms->each_src callback
 	my ($oidbin, $uid, $self, $uids, $url) = @_;
 	return if exists $uids->{$uid};
-	$self->{lei}->{sto}->ipc_do('lms_clear_src', $url, $uid);
+	$self->{lms}->clear_src($url, $uid);
 }
 
 # detects missed file moves
@@ -36,18 +36,16 @@ sub pmdir_cb { # called via LeiPmdir->each_mdir_fn
 	my ($folder, $bn) = ($f =~ m!\A(.+?)/(?:new|cur)/([^/]+)\z!) or
 		die "BUG: $f was not from a Maildir?";
 	substr($folder, 0, 0) = 'maildir:'; # add prefix
-	my $lms = $self->{-lms_ro} //= $self->{lei}->lms;
-	return if defined($lms->name_oidbin($folder, $bn));
+	return if scalar($self->{lms}->name_oidbin($folder, $bn));
 	my $eml = eml_from_path($f) // return;
 	my $oidbin = $self->{lei}->git_oid($eml)->digest;
-	$self->{lei}->{sto}->ipc_do('lms_set_src', $oidbin, $folder, \$bn);
+	$self->{lms}->set_src($oidbin, $folder, \$bn);
 }
 
 sub input_path_url { # overrides PublicInbox::LeiInput::input_path_url
 	my ($self, $input, @args) = @_;
-	my $lms = $self->{-lms_ro} //= $self->{lei}->lms;
 	if ($input =~ /\Amaildir:(.+)/i) {
-		$lms->each_src($input, \&prune_mdir, $self, my $mdir = $1);
+		$self->{lms}->each_src($input, \&prune_mdir, $self, $1);
 		$self->{lse} //= $self->{lei}->{sto}->search;
 		# call pmdir_cb (via maildir_each_file -> each_mdir_fn)
 		PublicInbox::LeiInput::input_path_url($self, $input);
@@ -56,12 +54,13 @@ sub input_path_url { # overrides PublicInbox::LeiInput::input_path_url
 		if (my $mic = $self->{lei}->{net}->mic_for_folder($uri)) {
 			my $uids = $mic->search('UID 1:*');
 			$uids = +{ map { $_ => undef } @$uids };
-			$lms->each_src($$uri, \&prune_imap, $self, $uids, $$uri)
+			$self->{lms}->each_src($$uri, \&prune_imap, $self,
+						$uids, $$uri)
 		} else {
 			$self->folder_missing($$uri);
 		}
 	} else { die "BUG: $input not supported" }
-	$self->{lei}->{pkt_op_p}->pkt_do('sto_done_request');
+	$self->{lei}->sto_done_request;
 }
 
 sub lei_refresh_mail_sync {
@@ -74,28 +73,37 @@ lei mail_sync.sqlite3 uninitialized, see lei-import(1)
 EOM
 	if (defined(my $all = $lei->{opt}->{all})) {
 		$lms->group2folders($lei, $all, \@folders) or return;
+		# TODO: handle NNTP servers which delete messages
+		@folders = grep(!m!\Anntps?://!, @folders);
 	} else {
-		my $err = $lms->arg2folder($lei, \@folders);
-		$lei->qerr(@{$err->{qerr}}) if $err->{qerr};
-		return $lei->fail($err->{fail}) if $err->{fail};
+		$lms->arg2folder($lei, \@folders); # may die
 	}
-	undef $lms; # must be done before fork
+	$lms->lms_pause; # must be done before fork
 	$sto->write_prepare($lei);
-	my $self = bless { missing_ok => 1 }, __PACKAGE__;
+	my $self = bless { missing_ok => 1, lms => $lms }, __PACKAGE__;
 	$lei->{opt}->{'mail-sync'} = 1; # for prepare_inputs
 	$self->prepare_inputs($lei, \@folders) or return;
-	my $ops = {};
-	$lei->{auth}->op_merge($ops, $self) if $lei->{auth};
-	(my $op_c, $ops) = $lei->workers_start($self, 1, $ops);
-	$lei->{wq1} = $self;
 	$lei->{-err_type} = 'non-fatal';
-	net_merge_all_done($self) unless $lei->{auth};
-	$lei->wait_wq_events($op_c, $ops); # net_merge_all_done if !{auth}
+	$lei->wq1_start($self);
+}
+
+sub ipc_atfork_child { # needed for PublicInbox::LeiPmdir
+	my ($self) = @_;
+	PublicInbox::LeiInput::input_only_atfork_child($self);
+	$self->{lms}->lms_write_prepare;
+	undef;
+}
+
+sub _complete_refresh_mail_sync {
+	my ($lei, @argv) = @_;
+	my $lms = $lei->lms or return ();
+	my $match_cb = $lei->complete_url_prepare(\@argv);
+	my @k = $lms->folders($argv[-1] // undef, 1);
+	my @m = map { $match_cb->($_) } @k;
+	@m ? @m : @k
 }
 
 no warnings 'once';
-*_complete_refresh_mail_sync = \&PublicInbox::LeiExportKw::_complete_export_kw;
-*ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child;
 *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done;
 
 1;