treewide: kill problematic "$h->{k} //= do {" assignments

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

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 32d4b9f3b42793ffb89cf040e0bc775ab1863bee..3e1706a0dd20258508666db347f85e75aee8d344 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -130,9 +130,10 @@ sub url_folder_cache {
 
 sub ale {
        my ($self) = @_;
-       $self->{ale} //= do {
+       $self->{ale} // do {
                require PublicInbox::LeiALE;
-               $self->_lei_cfg(1)->{ale} //= PublicInbox::LeiALE->new($self);
+               my $cfg = $self->_lei_cfg(1);
+               $self->{ale} = $cfg->{ale} //= PublicInbox::LeiALE->new($self);
        };
 }
 
@@ -179,7 +180,7 @@ our %CMD = ( # sorted in order of importance/use:
 
 'up' => [ 'OUTPUT...|--all', 'update saved search',
        qw(jobs|j=s lock=s@ alert=s@ mua=s verbose|v+ exclude=s@
-       remote-fudge-time=s all:s remote! local! external!), @c_opt ],
+       remote-fudge-time=s all:s remote! local! external!), @net_opt, @c_opt ],
 
 'lcat' => [ '--stdin|MSGID_OR_URL...', 'display local copy of message(s)',
        'stdin|', # /|\z/ must be first for lone dash
@@ -202,7 +203,7 @@ our %CMD = ( # sorted in order of importance/use:
 
 'mail-diff' => [ '--stdin|LOCATION...', 'diff the contents of emails',
        'stdin|', # /|\z/ must be first for lone dash
-       qw(verbose|v+ color:s no-color raw-header),
+       qw(verbose|v+ in-format|F=s color:s no-color raw-header),
        @diff_opt, @net_opt, @c_opt ],
 
 'add-external' => [ 'LOCATION',
@@ -215,7 +216,7 @@ our %CMD = ( # sorted in order of importance/use:
 'ls-mail-sync' => [ '[FILTER]', 'list mail sync folders',
                qw(z|0 globoff|g invert-match|v local remote), @c_opt ],
 'ls-mail-source' => [ 'URL', 'list IMAP or NNTP mail source folders',
-               qw(z|0 ascii l pretty url), @c_opt ],
+               qw(z|0 ascii l pretty url), @net_opt, @c_opt ],
 'forget-external' => [ 'LOCATION...|--prune',
        'exclude further results from a publicinbox|extindex',
        qw(prune), @c_opt ],
@@ -265,7 +266,8 @@ our %CMD = ( # sorted in order of importance/use:
 'forget-mail-sync' => [ 'LOCATION...',
        'forget sync information for a mail folder', @c_opt ],
 'refresh-mail-sync' => [ 'LOCATION...|--all',
-       'prune dangling sync data for a mail folder', 'all:s', @c_opt ],
+       'prune dangling sync data for a mail folder', 'all:s',
+               @net_opt, @c_opt ],
 'export-kw' => [ 'LOCATION...|--all',
        'one-time export of keywords of sync sources',
        qw(all:s mode=s), @net_opt, @c_opt ],
@@ -273,9 +275,9 @@ our %CMD = ( # sorted in order of importance/use:
        'one-time conversion from URL or filesystem to another format',
        qw(stdin| in-format|F=s out-format|f=s output|mfolder|o=s lock=s@ kw!),
        @net_opt, @c_opt ],
-'p2q' => [ 'FILE|COMMIT_OID|--stdin',
+'p2q' => [ 'LOCATION_OR_COMMIT...|--stdin',
        "use a patch to generate a query for `lei q --stdin'",
-       qw(stdin| want|w=s@ uri debug), @c_opt ],
+       qw(stdin| in-format|F=s want|w=s@ uri debug), @net_opt, @c_opt ],
 'config' => [ '[...]', sub {
                'git-config(1) wrapper for '._config_path($_[0]);
        }, qw(config-file|system|global|file|f=s), # for conflict detection
@@ -1126,7 +1128,7 @@ sub event_step {
        local %ENV = %{$self->{env}};
        local $current_lei = $self;
        eval {
-               my @fds = $recv_cmd->($self->{sock}, my $buf, 4096);
+               my @fds = $recv_cmd->($self->{sock} // return, my $buf, 4096);
                if (scalar(@fds) == 1 && !defined($fds[0])) {
                        return if $! == EAGAIN;
                        die "recvmsg: $!" if $! != ECONNRESET;
@@ -1158,10 +1160,10 @@ sub event_step {
 sub event_step_init {
        my ($self) = @_;
        my $sock = $self->{sock} or return;
-       $self->{-event_init_done} //= do { # persist til $ops done
+       $self->{-event_init_done} // do { # persist til $ops done
                $sock->blocking(0);
                $self->SUPER::new($sock, EPOLLIN);
-               $sock;
+               $self->{-event_init_done} = $sock;
        };
 }