www_stream: sh-friendly .onion URLs wrapping

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

diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm
index b6abd53367f7cfe5c2c24d96b7f60d487d2399cb..463fb9219749c0eb1b2f7b8860c23bb4fd3b3d96 100644 (file)
--- a/lib/PublicInbox/LeiTag.pm
+++ b/lib/PublicInbox/LeiTag.pm
@@ -6,6 +6,7 @@ package PublicInbox::LeiTag;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
+use PublicInbox::InboxWritable qw(eml_from_path);
 
 sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
        my ($self, $eml) = @_;
@@ -14,7 +15,7 @@ sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
                $self->{lei}->{sto}->ipc_do('update_xvmd', $xoids, $eml,
                                                $self->{vmd_mod});
        } else {
-               ++$self->{missing};
+               ++$self->{unimported};
        }
 }
 
@@ -24,8 +25,9 @@ sub input_mbox_cb {
        input_eml_cb($self, $eml);
 }
 
-sub input_maildir_cb { # maildir_each_eml cb
-       my ($f, $kw, $eml, $self) = @_;
+sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn
+       my ($self, $f) = @_;
+       my $eml = eml_from_path($f) or return;
        input_eml_cb($self, $eml);
 }
 
@@ -38,28 +40,28 @@ sub lei_tag { # the "lei tag" method
        my ($lei, @argv) = @_;
        my $sto = $lei->_lei_store(1);
        $sto->write_prepare($lei);
-       my $self = bless { missing => 0 }, __PACKAGE__;
+       my $self = bless {}, __PACKAGE__;
        $lei->ale; # refresh and prepare
        my $vmd_mod = $self->vmd_mod_extract(\@argv);
        return $lei->fail(join("\n", @{$vmd_mod->{err}})) if $vmd_mod->{err};
+       $self->{vmd_mod} = $vmd_mod; # before LeiPmdir->new in prepare_inputs
        $self->prepare_inputs($lei, \@argv) or return;
        grep(defined, @$vmd_mod{qw(+kw +L -L -kw)}) or
                return $lei->fail('no keywords or labels specified');
        my $ops = {};
        $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
-       $self->{vmd_mod} = $vmd_mod;
        my $j = $self->{-wq_nr_workers} = 1; # locked for now
        (my $op_c, $ops) = $lei->workers_start($self, $j, $ops);
        $lei->{wq1} = $self;
        $lei->{-err_type} = 'non-fatal';
        net_merge_all_done($self) unless $lei->{auth};
-       $op_c->op_wait_event($ops);
+       $lei->wait_wq_events($op_c, $ops);
 }
 
-sub note_missing {
+sub note_unimported {
        my ($self) = @_;
-       my $n = $self->{missing} or return;
-       $self->{lei}->child_error(1 << 8, "$n missed messages");
+       my $n = $self->{unimported} or return;
+       $self->{lei}->{pkt_op_p}->pkt_do('incr', 'unimported', $n);
 }
 
 sub ipc_atfork_child {
@@ -67,7 +69,7 @@ sub ipc_atfork_child {
        PublicInbox::LeiInput::input_only_atfork_child($self);
        $self->{lse} = $self->{lei}->{sto}->search;
        # this goes out-of-scope at worker process exit:
-       PublicInbox::OnDestroy->new($$, \&note_missing, $self);
+       PublicInbox::OnDestroy->new($$, \&note_unimported, $self);
 }
 
 # Workaround bash word-splitting s to ['kw', ':', 'keyword' ...]