* [PATCH] lei q: avoid redundant default setting for sort with l2m
@ 2021-03-30 9:10 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-03-30 9:10 UTC (permalink / raw)
To: meta
No point in munging user-supplied $lei->{opt} when %mset_opt
exists. We'll be depending on docid being in descending order
for saved search support.
---
lib/PublicInbox/LeiOverview.pm | 2 --
lib/PublicInbox/LeiQuery.pm | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 68f6c792..cdd9ee04 100644
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -101,8 +101,6 @@ sub new {
if ($json) {
$lei->{dedupe} //= PublicInbox::LeiDedupe->new($lei);
} else {
- # default to the cheapest sort since MUA usually resorts
- $opt->{'sort'} //= 'docid' if $devfd < 0;
$lei->{l2m} = eval { PublicInbox::LeiToMail->new($lei) };
return $lei->fail($@) if $@;
if ($opt->{mua} && $lei->{l2m}->lock_free) {
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 5376c7f8..3a437bf0 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -128,8 +128,8 @@ sub lei_q {
die "unrecognized --sort=$sort\n";
}
}
- # descending docid order
- $mset_opt{relevance} //= -2 if $opt->{threads};
+ # descending docid order is cheapest, MUA controls sorting order
+ $mset_opt{relevance} //= -2 if $self->{l2m} || $opt->{threads};
$self->{mset_opt} = \%mset_opt;
if ($opt->{stdin}) {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-30 9:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30 9:10 [PATCH] lei q: avoid redundant default setting for sort with l2m Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).