From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 85FE31FA10 for ; Fri, 11 Sep 2020 07:32:34 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/3] nntp: share more code between art_lookup callers Date: Fri, 11 Sep 2020 07:32:33 +0000 Message-Id: <20200911073233.29895-4-e@80x24.org> In-Reply-To: <20200911073233.29895-1-e@80x24.org> References: <20200911073233.29895-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This prepares us for future changes to improve scalability to many inboxes. --- lib/PublicInbox/NNTP.pm | 44 +++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index 46398cd4..88fe2bb0 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -446,8 +446,8 @@ sub set_nntp_headers ($$) { } } -sub art_lookup ($$) { - my ($self, $art) = @_; +sub art_lookup ($$$) { + my ($self, $art, $code) = @_; my $ng = $self->{ng}; my ($n, $mid); my $err; @@ -484,7 +484,17 @@ find_mid: found: my $smsg = $ng->over->get_art($n) or return $err; $smsg->{-ibx} = $ng; - $smsg; + if ($code == 223) { # STAT + set_art($self, $n); + "223 $n <$smsg->{mid}> article retrieved - " . + "request text separately"; + } else { # HEAD | BODY | ARTICLE + $smsg->{nntp} = $self; + $smsg->{nntp_code} = $code; + set_art($self, $art); + # this dereferences to `undef' + ${git_async_cat($ng->git, $smsg->{blob}, \&blob_cb, $smsg)}; + } } sub msg_body_write ($$) { @@ -520,7 +530,7 @@ sub msg_hdr_write ($$) { sub blob_cb { # called by git->cat_async via git_async_cat my ($bref, $oid, $type, $size, $smsg) = @_; my $self = $smsg->{nntp}; - my $code = $smsg->{nntp_code} // 220; + my $code = $smsg->{nntp_code}; if (!defined($oid)) { # it's possible to have TOCTOU if an admin runs # public-inbox-(edit|purge), just move onto the next message @@ -553,40 +563,22 @@ sub blob_cb { # called by git->cat_async via git_async_cat sub cmd_article ($;$) { my ($self, $art) = @_; - my $smsg = art_lookup($self, $art); - return $smsg unless ref $smsg; - set_art($self, $art); - $smsg->{nntp} = $self; - ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)}; + art_lookup($self, $art, 220); } sub cmd_head ($;$) { my ($self, $art) = @_; - my $smsg = art_lookup($self, $art); - return $smsg unless ref $smsg; - set_art($self, $art); - $smsg->{nntp} = $self; - $smsg->{nntp_code} = 221; - ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)}; + art_lookup($self, $art, 221); } sub cmd_body ($;$) { my ($self, $art) = @_; - my $smsg = art_lookup($self, $art); - return $smsg unless ref $smsg; - set_art($self, $art); - $smsg->{nntp} = $self; - $smsg->{nntp_code} = 222; - ${git_async_cat($smsg->{-ibx}->git, $smsg->{blob}, \&blob_cb, $smsg)}; + art_lookup($self, $art, 222); } sub cmd_stat ($;$) { my ($self, $art) = @_; - my $smsg = art_lookup($self, $art); # art may be msgid - return $smsg unless ref $smsg; - $art = $smsg->{num}; - set_art($self, $art); - "223 $art <$smsg->{mid}> article retrieved - request text separately"; + art_lookup($self, $art, 223); # art may be msgid } sub cmd_ihave ($) { '435 article not wanted - do not send it' }