X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNetReader.pm;h=b2c4fee25756d75d2f4c0148e38af986ac678fc5;hb=3af54d4bdba7fb8abce42cce820668d20f348451;hp=61ea538b75cbcda7e8fdbf09df5bf3f498208a96;hpb=725fd624277364402a86262486cdb79458db4ed8;p=public-inbox.git diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 61ea538b..b2c4fee2 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -7,33 +7,28 @@ use strict; use v5.10.1; use parent qw(Exporter PublicInbox::IPC); use PublicInbox::Eml; +use PublicInbox::Config; +our %IMAPflags2kw = map {; "\\\u$_" => $_ } qw(seen answered flagged draft); +$IMAPflags2kw{'$Forwarded'} = 'forwarded'; # RFC 5550 -# TODO: trim this down, this is huge -our @EXPORT = qw(uri_new uri_scheme uri_section - mic_for nn_new nn_for - imap_url nntp_url - cfg_bool cfg_intvl imap_common_init - ); +our @EXPORT = qw(uri_section imap_uri nntp_uri); -# avoid exposing deprecated "snews" to users. -my %SCHEME_MAP = ('snews' => 'nntps'); - -sub uri_scheme ($) { - my ($uri) = @_; - my $scheme = $uri->scheme; - $SCHEME_MAP{$scheme} // $scheme; +sub ndump { + require Data::Dumper; + Data::Dumper->new(\@_)->Useqq(1)->Terse(1)->Dump; } # returns the git config section name, e.g [imap "imaps://user@example.com"] # without the mailbox, so we can share connections between different inboxes sub uri_section ($) { my ($uri) = @_; - uri_scheme($uri) . '://' . $uri->authority; + $uri->scheme . '://' . $uri->authority; } sub auth_anon_cb { '' }; # for Mail::IMAPClient::Authcallback -sub mic_for { # mic = Mail::IMAPClient +# mic_for may prompt the user and store auth info, prepares mic_get +sub mic_for ($$$$) { # mic = Mail::IMAPClient my ($self, $url, $mic_args, $lei) = @_; require PublicInbox::URIimap; my $uri = PublicInbox::URIimap->new($url); @@ -57,7 +52,16 @@ sub mic_for { # mic = Mail::IMAPClient %$common, # may set Starttls, Compress, Debug .... }; require PublicInbox::IMAPClient; - my $mic = PublicInbox::IMAPClient->new(%$mic_arg) or + my %socks; + if ($lei && $lei->{socks5h}) { + my %opt = %{$lei->{socks5h}}; + $opt{ConnectAddr} = delete $mic_arg->{Server}; + $opt{ConnectPort} = delete $mic_arg->{Port}; + $socks{Socket} = IO::Socket::Socks->new(%opt) or die + "E: <$url> ".eval('$IO::Socket::Socks::SOCKS_ERROR'); + $self->{mic_socks5h} = \%opt; + } + my $mic = PublicInbox::IMAPClient->new(%$mic_arg, %socks) or die "E: <$url> new: $@\n"; # default to using STARTTLS if it's available, but allow @@ -101,15 +105,6 @@ sub mic_for { # mic = Mail::IMAPClient $mic; } -sub uri_new { - my ($url) = @_; - require URI; - - # URI::snews exists, URI::nntps does not, so use URI::snews - $url =~ s!\Anntps://!snews://!i; - URI->new($url); -} - # Net::NNTP doesn't support CAPABILITIES, yet sub try_starttls ($) { my ($host) = @_; @@ -120,8 +115,14 @@ sub try_starttls ($) { } sub nn_new ($$$) { - my ($nn_arg, $nntp_opt, $url) = @_; - my $nn = Net::NNTP->new(%$nn_arg) or die "E: <$url> new: $!\n"; + my ($nn_arg, $nntp_opt, $uri) = @_; + my $nn; + if (defined $nn_arg->{ProxyAddr}) { + eval { $nn = PublicInbox::NetNNTPSocks->new_socks(%$nn_arg) }; + die "E: <$uri> $@\n" if $@; + } else { + $nn = Net::NNTP->new(%$nn_arg) or die "E: <$uri> new: $!\n"; + } # default to using STARTTLS if it's available, but allow # it to be disabled for localhost/VPN users @@ -130,27 +131,26 @@ sub nn_new ($$$) { try_starttls($nn_arg->{Host})) { # soft fail by default $nn->starttls or warn <<""; -W: <$url> STARTTLS tried and failed (not requested) +W: <$uri> STARTTLS tried and failed (not requested) } elsif ($nntp_opt->{starttls}) { # hard fail if explicitly configured $nn->starttls or die <<""; -E: <$url> STARTTLS requested and failed +E: <$uri> STARTTLS requested and failed } } elsif ($nntp_opt->{starttls}) { $nn->can('starttls') or - die "E: <$url> Net::NNTP too old for STARTTLS\n"; + die "E: <$uri> Net::NNTP too old for STARTTLS\n"; $nn->starttls or die <<""; -E: <$url> STARTTLS requested and failed +E: <$uri> STARTTLS requested and failed } $nn; } -sub nn_for ($$$;$) { # nn = Net::NNTP - my ($self, $url, $nn_args, $lei) = @_; - my $uri = uri_new($url); +sub nn_for ($$$$) { # nn = Net::NNTP + my ($self, $uri, $nn_args, $lei) = @_; my $sec = uri_section($uri); my $nntp_opt = $self->{nntp_opt}->{$sec} //= {}; my $host = $uri->host; @@ -162,7 +162,7 @@ sub nn_for ($$$;$) { # nn = Net::NNTP require PublicInbox::GitCredential; $cred = bless { url => $sec, - protocol => uri_scheme($uri), + protocol => $uri->scheme, host => $host, }, 'PublicInbox::GitCredential'; ($u, $p) = split(/:/, $ui, 2); @@ -176,14 +176,17 @@ sub nn_for ($$$;$) { # nn = Net::NNTP SSL => $uri->secure, # snews == nntps %$common, # may Debug .... }; - my $nn = nn_new($nn_arg, $nntp_opt, $url); - + if ($lei && $lei->{socks5h}) { + require PublicInbox::NetNNTPSocks; + %$nn_arg = (%$nn_arg, %{$lei->{socks5h}}); + } + my $nn = nn_new($nn_arg, $nntp_opt, $uri); if ($cred) { $cred->fill($lei); # may prompt user here if ($nn->authinfo($u, $p)) { push @{$nntp_opt->{-postconn}}, [ 'authinfo', $u, $p ]; } else { - warn "E: <$url> AUTHINFO $u XXXX failed\n"; + warn "E: <$uri> AUTHINFO $u XXXX failed\n"; $nn = undef; } } @@ -194,12 +197,12 @@ sub nn_for ($$$;$) { # nn = Net::NNTP if ($nn->compress) { push @{$nntp_opt->{-postconn}}, [ 'compress' ]; } else { - warn "W: <$url> COMPRESS failed\n"; + warn "W: <$uri> COMPRESS failed\n"; } } else { delete $nntp_opt->{compress}; warn <<""; -W: <$url> COMPRESS not supported by Net::NNTP +W: <$uri> COMPRESS not supported by Net::NNTP W: see https://rt.cpan.org/Ticket/Display.html?id=129967 for updates } @@ -210,22 +213,19 @@ W: see https://rt.cpan.org/Ticket/Display.html?id=129967 for updates $nn; } -sub imap_url { +sub imap_uri { my ($url) = @_; require PublicInbox::URIimap; my $uri = PublicInbox::URIimap->new($url); - $uri ? $uri->canonical->as_string : undef; + $uri ? $uri->canonical : undef; } -my %IS_NNTP = (news => 1, snews => 1, nntp => 1); -sub nntp_url { +my %IS_NNTP = (news => 1, snews => 1, nntp => 1, nntps => 1); +sub nntp_uri { my ($url) = @_; - my $uri = uri_new($url); - return unless $uri && $IS_NNTP{$uri->scheme} && $uri->group; - $url = $uri->canonical->as_string; - # nntps is IANA registered, snews is deprecated - $url =~ s!\Asnews://!nntps://!; - $url; + require PublicInbox::URInntps; + my $uri = PublicInbox::URInntps->new($url); + $uri && $IS_NNTP{$uri->scheme} && $uri->group ? $uri->canonical : undef; } sub cfg_intvl ($$$) { @@ -251,29 +251,29 @@ sub cfg_bool ($$$) { # flesh out common IMAP-specific data structures sub imap_common_init ($;$) { my ($self, $lei) = @_; + return unless $self->{imap_order}; $self->{quiet} = 1 if $lei && $lei->{opt}->{quiet}; eval { require PublicInbox::IMAPClient } or die "Mail::IMAPClient is required for IMAP:\n$@\n"; - eval { require PublicInbox::IMAPTracker } or + ($lei || eval { require PublicInbox::IMAPTracker }) or die "DBD::SQLite is required for IMAP\n:$@\n"; require PublicInbox::URIimap; my $cfg = $self->{pi_cfg} // $lei->_lei_cfg; my $mic_args = {}; # scheme://authority => Mail:IMAPClient arg - for my $url (@{$self->{imap_order}}) { - my $uri = PublicInbox::URIimap->new($url); + for my $uri (@{$self->{imap_order}}) { my $sec = uri_section($uri); for my $k (qw(Starttls Debug Compress)) { - my $bool = cfg_bool($cfg, "imap.$k", $url) // next; + my $bool = cfg_bool($cfg, "imap.$k", $$uri) // next; $mic_args->{$sec}->{$k} = $bool; } - my $to = cfg_intvl($cfg, 'imap.timeout', $url); + my $to = cfg_intvl($cfg, 'imap.timeout', $$uri); $mic_args->{$sec}->{Timeout} = $to if $to; for my $k (qw(pollInterval idleInterval)) { - $to = cfg_intvl($cfg, "imap.$k", $url) // next; + $to = cfg_intvl($cfg, "imap.$k", $$uri) // next; $self->{imap_opt}->{$sec}->{$k} = $to; } my $k = 'imap.fetchBatchSize'; - my $bs = $cfg->urlmatch($k, $url) // next; + my $bs = $cfg->urlmatch($k, $$uri) // next; if ($bs =~ /\A([0-9]+)\z/) { $self->{imap_opt}->{$sec}->{batch_size} = $bs; } else { @@ -283,25 +283,75 @@ sub imap_common_init ($;$) { # make sure we can connect and cache the credentials in memory $self->{mic_arg} = {}; # schema://authority => IMAPClient->new args my $mics = {}; # schema://authority => IMAPClient obj - for my $url (@{$self->{imap_order}}) { - my $uri = PublicInbox::URIimap->new($url); + for my $uri (@{$self->{imap_order}}) { my $sec = uri_section($uri); - $mics->{$sec} //= mic_for($self, $url, $mic_args, $lei); + my $mic = $mics->{$sec} //= + mic_for($self, "$sec/", $mic_args, $lei) // + die "Unable to continue\n"; + next unless $self->isa('PublicInbox::NetWriter'); + my $dst = $uri->mailbox // next; + next if $mic->exists($dst); # already exists + $mic->create($dst) or die "CREATE $dst failed <$uri>: $@"; } $mics; } +# flesh out common NNTP-specific data structures +sub nntp_common_init ($;$) { + my ($self, $lei) = @_; + return unless $self->{nntp_order}; + $self->{quiet} = 1 if $lei && $lei->{opt}->{quiet}; + eval { require Net::NNTP } or + die "Net::NNTP is required for NNTP:\n$@\n"; + ($lei || eval { require PublicInbox::IMAPTracker }) or + die "DBD::SQLite is required for NNTP\n:$@\n"; + my $cfg = $self->{pi_cfg} // $lei->_lei_cfg; + my $nn_args = {}; # scheme://authority => Net::NNTP->new arg + for my $uri (@{$self->{nntp_order}}) { + my $sec = uri_section($uri); + + # Debug and Timeout are passed to Net::NNTP->new + my $v = cfg_bool($cfg, 'nntp.Debug', $$uri); + $nn_args->{$sec}->{Debug} = $v if defined $v; + my $to = cfg_intvl($cfg, 'nntp.Timeout', $$uri); + $nn_args->{$sec}->{Timeout} = $to if $to; + + # Net::NNTP post-connect commands + for my $k (qw(starttls compress)) { + $v = cfg_bool($cfg, "nntp.$k", $$uri) // next; + $self->{nntp_opt}->{$sec}->{$k} = $v; + } + + # internal option + for my $k (qw(pollInterval)) { + $to = cfg_intvl($cfg, "nntp.$k", $$uri) // next; + $self->{nntp_opt}->{$sec}->{$k} = $to; + } + } + # make sure we can connect and cache the credentials in memory + $self->{nn_arg} = {}; # schema://authority => Net::NNTP->new args + my %nn; # schema://authority => Net::NNTP object + for my $uri (@{$self->{nntp_order}}) { + my $sec = uri_section($uri); + $nn{$sec} //= nn_for($self, $uri, $nn_args, $lei); + } + \%nn; # for optional {nn_cached} +} + sub add_url { my ($self, $arg) = @_; - if (my $url = imap_url($arg)) { - push @{$self->{imap_order}}, $url; + my $uri; + if ($uri = imap_uri($arg)) { + push @{$self->{imap_order}}, $uri; + } elsif ($uri = nntp_uri($arg)) { + push @{$self->{nntp_order}}, $uri; } else { push @{$self->{unsupported_url}}, $arg; } } sub errors { - my ($self) = @_; + my ($self, $lei) = @_; if (my $u = $self->{unsupported_url}) { return "Unsupported URL(s): @$u"; } @@ -309,34 +359,72 @@ sub errors { eval { require PublicInbox::IMAPClient } or die "Mail::IMAPClient is required for IMAP:\n$@\n"; } + if ($self->{nntp_order}) { + eval { require Net::NNTP } or + die "Net::NNTP is required for NNTP:\n$@\n"; + } + if ($lei && (($lei->{opt}->{proxy}//'') =~ m!\Asocks5h:// + (?: \[ ([^\]]+) \] | ([^:/]+) ) + (?::([0-9]+))?/?(?:,|\z)!ix)) { + my ($h, $p) = ($1 // $2, $3 + 0); + $h = '127.0.0.1' if $h eq '0'; + eval { require IO::Socket::Socks } or die <{socks5h} = { ProxyAddr => $h, ProxyPort => $p }; + } undef; } -my %IMAPflags2kw = ( - '\Seen' => 'seen', - '\Answered' => 'answered', - '\Flagged' => 'flagged', - '\Draft' => 'draft', -); - sub _imap_do_msg ($$$$$) { my ($self, $url, $uid, $raw, $flags) = @_; # our target audience expects LF-only, save storage $$raw =~ s/\r\n/\n/sg; my $kw = []; for my $f (split(/ /, $flags)) { - my $k = $IMAPflags2kw{$f} // next; # TODO: X-Label? - push @$kw, $k; + if (my $k = $IMAPflags2kw{$f}) { + push @$kw, $k; + } elsif ($f eq "\\Recent") { # not in JMAP + } elsif ($f eq "\\Deleted") { # not in JMAP + return; + } elsif ($self->{verbose}) { + warn "# unknown IMAP flag $f <$url/;UID=$uid>\n"; + } } + @$kw = sort @$kw; # for all UI/UX purposes my ($eml_cb, @args) = @{$self->{eml_each}}; $eml_cb->($url, $uid, $kw, PublicInbox::Eml->new($raw), @args); } +sub run_commit_cb ($) { + my ($self) = @_; + my $cmt_cb_args = $self->{on_commit} or return; + my ($cb, @args) = @$cmt_cb_args; + $cb->(@args); +} + +sub _itrk_last ($$;$) { + my ($self, $uri, $r_uidval) = @_; + return (undef, undef, $r_uidval) unless $self->{incremental}; + my ($itrk, $l_uid, $l_uidval); + if (defined(my $lms = $self->{-lms_ro})) { # LeiMailSync or 0 + $uri->uidvalidity($r_uidval) if defined $r_uidval; + my $x; + $l_uid = ($lms && ($x = $lms->location_stats($$uri))) ? + $x->{'uid.max'} : undef; + # itrk remains undef, lei/store worker writes to + # mail_sync.sqlite3 + } else { + $itrk = PublicInbox::IMAPTracker->new($$uri); + ($l_uidval, $l_uid) = $itrk->get_last($$uri); + } + ($itrk, $l_uid, $l_uidval //= $r_uidval); +} + sub _imap_fetch_all ($$$) { - my ($self, $mic, $url) = @_; - my $uri = PublicInbox::URIimap->new($url); - my $sec = uri_section($uri); - my $mbx = $uri->mailbox; + my ($self, $mic, $orig_uri) = @_; + my $sec = uri_section($orig_uri); + my $mbx = $orig_uri->mailbox; $mic->Clear(1); # trim results history $mic->examine($mbx) or return "E: EXAMINE $mbx ($sec) failed: $!"; my ($r_uidval, $r_uidnext); @@ -346,26 +434,34 @@ sub _imap_fetch_all ($$$) { last if $r_uidval && $r_uidnext; } $r_uidval //= $mic->uidvalidity($mbx) // - return "E: $url cannot get UIDVALIDITY"; + return "E: $orig_uri cannot get UIDVALIDITY"; $r_uidnext //= $mic->uidnext($mbx) // - return "E: $url cannot get UIDNEXT"; - my $itrk = $self->{incremental} ? - PublicInbox::IMAPTracker->new($url) : 0; - my ($l_uidval, $l_uid) = $itrk ? $itrk->get_last : (); - $l_uidval //= $r_uidval; # first time - $l_uid //= 1; - if ($l_uidval != $r_uidval) { - return "E: $url UIDVALIDITY mismatch\n". - "E: local=$l_uidval != remote=$r_uidval"; - } + return "E: $orig_uri cannot get UIDNEXT"; + my $expect = $orig_uri->uidvalidity // $r_uidval; + return <clone; + my ($itrk, $l_uid, $l_uidval) = _itrk_last($self, $uri, $r_uidval); + return <uidvalidity($r_uidval); + $l_uid //= 0; my $r_uid = $r_uidnext - 1; - if ($l_uid != 1 && $l_uid > $r_uid) { - return "E: $url local UID exceeds remote ($l_uid > $r_uid)\n". - "E: $url strangely, UIDVALIDLITY matches ($l_uidval)\n"; - } + return < $r_uid; +E: $uri local UID exceeds remote ($l_uid > $r_uid) +E: $uri strangely, UIDVALIDLITY matches ($l_uidval) +EOF return if $l_uid >= $r_uid; # nothing to do - - warn "# $url fetching UID $l_uid:$r_uid\n" unless $self->{quiet}; + $l_uid ||= 1; + my ($mod, $shard) = @{$self->{shard_info} // []}; + unless ($self->{quiet}) { + my $m = $mod ? " [(UID % $mod) == $shard]" : ''; + warn "# $uri fetching UID $l_uid:$r_uid$m\n"; + } $mic->Uid(1); # the default, we hope my $bs = $self->{imap_opt}->{$sec}->{batch_size} // 1; my $req = $mic->imap4rev1 ? 'BODY.PEEK[]' : 'RFC822.PEEK'; @@ -377,8 +473,10 @@ sub _imap_fetch_all ($$$) { # I wish "UID FETCH $START:*" could work, but: # 1) servers do not need to return results in any order # 2) Mail::IMAPClient doesn't offer a streaming API - $uids = $mic->search("UID $l_uid:*") or - return "E: $url UID SEARCH $l_uid:* error: $!"; + unless ($uids = $mic->search("UID $l_uid:*")) { + return if $!{EINTR} && $self->{quit}; + return "E: $uri UID SEARCH $l_uid:* error: $!"; + } return if scalar(@$uids) == 0; # RFC 3501 doesn't seem to indicate order of UID SEARCH @@ -392,53 +490,182 @@ sub _imap_fetch_all ($$$) { $l_uid = $uids->[-1] + 1; # for next search my $last_uid; my $n = $self->{max_batch}; + + @$uids = grep { ($_ % $mod) == $shard } @$uids if $mod; while (scalar @$uids) { my @batch = splice(@$uids, 0, $bs); $batch = join(',', @batch); local $0 = "UID:$batch $mbx $sec"; my $r = $mic->fetch_hash($batch, $req, 'FLAGS'); unless ($r) { # network error? - $err = "E: $url UID FETCH $batch error: $!"; + last if $!{EINTR} && $self->{quit}; + $err = "E: $uri UID FETCH $batch error: $!"; last; } for my $uid (@batch) { # messages get deleted, so holes appear my $per_uid = delete $r->{$uid} // next; my $raw = delete($per_uid->{$key}) // next; - _imap_do_msg($self, $url, $uid, \$raw, + _imap_do_msg($self, $$uri, $uid, \$raw, $per_uid->{FLAGS}); $last_uid = $uid; last if $self->{quit}; } last if $self->{quit}; } + run_commit_cb($self); $itrk->update_last($r_uidval, $last_uid) if $itrk; } until ($err || $self->{quit}); $err; } -sub imap_each { - my ($self, $url, $eml_cb, @args) = @_; - my $uri = PublicInbox::URIimap->new($url); +# uses cached auth info prepared by mic_for +sub mic_get { + my ($self, $uri) = @_; my $sec = uri_section($uri); + # see if caller saved result of imap_common_init + my $cached = $self->{mics_cached}; + if ($cached) { + my $mic = $cached->{$sec}; + return $mic if $mic && $mic->IsConnected; + delete $cached->{$sec}; + } my $mic_arg = $self->{mic_arg}->{$sec} or die "BUG: no Mail::IMAPClient->new arg for $sec"; - local $0 = $uri->mailbox." $sec"; - my $cb_name = $mic_arg->{Authcallback}; - if (ref($cb_name) ne 'CODE') { - $mic_arg->{Authcallback} = $self->can($cb_name); + if (defined(my $cb_name = $mic_arg->{Authcallback})) { + if (ref($cb_name) ne 'CODE') { + $mic_arg->{Authcallback} = $self->can($cb_name); + } } - my $mic = PublicInbox::IMAPClient->new(%$mic_arg, Debug => 0); + my %socks; + if (my $s5h = $self->{mic_socks5h}) { + $socks{Socket} = IO::Socket::Socks->new(%$s5h) or die + "E: <$$uri> ".eval('$IO::Socket::Socks::SOCKS_ERROR'); + } + my $mic = PublicInbox::IMAPClient->new(%$mic_arg, %socks); + $cached //= {}; # invalid placeholder if no cache enabled + $mic && $mic->IsConnected ? ($cached->{$sec} = $mic) : undef; +} + +sub imap_each { + my ($self, $url, $eml_cb, @args) = @_; + my $uri = ref($url) ? $url : PublicInbox::URIimap->new($url); + my $sec = uri_section($uri); + local $0 = $uri->mailbox." $sec"; + my $mic = mic_get($self, $uri); my $err; - if ($mic && $mic->IsConnected) { + if ($mic) { local $self->{eml_each} = [ $eml_cb, @args ]; - $err = _imap_fetch_all($self, $mic, $url); + $err = _imap_fetch_all($self, $mic, $uri); } else { - $err = "E: not connected: $!"; + $err = "E: <$uri> not connected: $!"; } + die $err if $err && $self->{-can_die}; + warn $err if $err; $mic; } +# may used cached auth info prepared by nn_for once +sub nn_get { + my ($self, $uri) = @_; + my $sec = uri_section($uri); + # see if caller saved result of nntp_common_init + my $cached = $self->{nn_cached} // {}; + my $nn; + $nn = delete($cached->{$sec}) and return $nn; + my $nn_arg = $self->{nn_arg}->{$sec} or + die "BUG: no Net::NNTP->new arg for $sec"; + my $nntp_opt = $self->{nntp_opt}->{$sec}; + $nn = nn_new($nn_arg, $nntp_opt, $uri) or return; + if (my $postconn = $nntp_opt->{-postconn}) { + for my $m_arg (@$postconn) { + my ($method, @args) = @$m_arg; + $nn->$method(@args) and next; + die "E: <$uri> $method failed\n"; + return; + } + } + $nn; +} + +sub _nntp_fetch_all ($$$) { + my ($self, $nn, $uri) = @_; + my ($group, $num_a, $num_b) = $uri->group; + my $sec = uri_section($uri); + my ($nr, $beg, $end) = $nn->group($group); + unless (defined($nr)) { + my $msg = ndump($nn->message); + return "E: GROUP $group <$sec> $msg"; + } + + # IMAPTracker is also used for tracking NNTP, UID == article number + # LIST.ACTIVE can get the equivalent of UIDVALIDITY, but that's + # expensive. So we assume newsgroups don't change: + my ($itrk, $l_art) = _itrk_last($self, $uri); + + # allow users to specify articles to refetch + # cf. https://tools.ietf.org/id/draft-gilman-news-url-01.txt + # nntp://example.com/inbox.foo/$num_a-$num_b + $beg = $num_a if defined($num_a) && $num_a < $beg; + $end = $num_b if defined($num_b) && $num_b < $end; + if (defined $l_art) { + return if $l_art >= $end; # nothing to do + $beg = $l_art + 1; + } + my ($err, $art, $last_art, $kw); # kw stays undef, no keywords in NNTP + unless ($self->{quiet}) { + warn "# $uri fetching ARTICLE $beg..$end\n"; + } + my $n = $self->{max_batch}; + for ($beg..$end) { + last if $self->{quit}; + $art = $_; + if (--$n < 0) { + run_commit_cb($self); + $itrk->update_last(0, $last_art) if $itrk; + $n = $self->{max_batch}; + } + my $raw = $nn->article($art); + unless (defined($raw)) { + my $msg = ndump($nn->message); + if ($nn->code == 421) { # pseudo response from Net::Cmd + $err = "E: $msg"; + last; + } else { # probably just a deleted message (spam) + warn "W: $msg"; + next; + } + } + $raw = join('', @$raw); + $raw =~ s/\r\n/\n/sg; + my ($eml_cb, @args) = @{$self->{eml_each}}; + $eml_cb->($uri, $art, $kw, PublicInbox::Eml->new(\$raw), @args); + $last_art = $art; + } + run_commit_cb($self); + $itrk->update_last(0, $last_art) if $itrk; + $err; +} + +sub nntp_each { + my ($self, $url, $eml_cb, @args) = @_; + my $uri = ref($url) ? $url : PublicInbox::URInntps->new($url); + my $sec = uri_section($uri); + local $0 = $uri->group ." $sec"; + my $nn = nn_get($self, $uri); + return if $self->{quit}; + my $err; + if ($nn) { + local $self->{eml_each} = [ $eml_cb, @args ]; + $err = _nntp_fetch_all($self, $nn, $uri); + } else { + $err = "E: <$uri> not connected: $!"; + } + die $err if $err && $self->{-can_die}; + warn $err if $err; + $nn; +} + sub new { bless {}, shift }; 1;