imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/IMAPsearchqp.pm b/lib/PublicInbox/IMAPsearchqp.pm
index 5c82faa5cfcf201282320e06643e03bfcc766b61..9f0c1205492dfb23cb67dbd58cebbc58497b5cac 100644 (file)
--- a/lib/PublicInbox/IMAPsearchqp.pm
+++ b/lib/PublicInbox/IMAPsearchqp.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # IMAP search query parser.  cf RFC 3501
 
@@ -124,7 +124,7 @@ sub ON {
        my ($self, $item) = @_;
        my $ts = yyyymmdd($item);
        my $end = $ts + 86399; # no leap day
-       push @{$self->{xap}}, "ts:$ts..$end";
+       push @{$self->{xap}}, "rt:$ts..$end";
        my $sql = $self->{sql} or return 1;
        $$sql .= " AND ts >= $ts AND ts <= $end";
 }
@@ -132,7 +132,7 @@ sub ON {
 sub BEFORE {
        my ($self, $item) = @_;
        my $ts = yyyymmdd($item);
-       push @{$self->{xap}}, "ts:..$ts";
+       push @{$self->{xap}}, "rt:..$ts";
        my $sql = $self->{sql} or return 1;
        $$sql .= " AND ts <= $ts";
 }
@@ -140,7 +140,7 @@ sub BEFORE {
 sub SINCE {
        my ($self, $item) = @_;
        my $ts = yyyymmdd($item);
-       push @{$self->{xap}}, "ts:$ts..";
+       push @{$self->{xap}}, "rt:$ts..";
        my $sql = $self->{sql} or return 1;
        $$sql .= " AND ts >= $ts";
 }
@@ -162,11 +162,24 @@ sub msn_set {
        uid_set($self, $seq_set);
 }
 
+# things that should not match
+sub impossible {
+       my ($self) = @_;
+       push @{$self->{xap}}, 'z:..0';
+       my $sql = $self->{sql} or return 1;
+       $$sql .= ' AND num < 0';
+}
+
 my $prd = Parse::RecDescent->new(<<'EOG');
 <nocheck>
 { my $q = $PublicInbox::IMAPsearchqp::q; }
 search_key : CHARSET(?) search_key1(s) { $return = $q }
-search_key1 : "ALL" | "RECENT" | "UNSEEN" | "NEW"
+
+# n.b. we silently ignore most per-message flags right now;
+# they're here for now to not dump parser errors.
+search_key1 : "ALL" | "ANSWERED" | "RECENT" | "UNSEEN" | "SEEN" | "NEW"
+       | "UNANSWERED" | "UNDELETED" | "UNDRAFT" | "UNFLAGGED"
+       | DELETED | DRAFT | FLAGGED | OLD
        | OR_search_keys
        | NOT_search_key
        | LARGER_number
@@ -204,8 +217,14 @@ BEFORE_date : 'BEFORE' date { $q->BEFORE(\%item) }
 
 MSN_set : sequence_set { $q->msn_set($item{sequence_set}) }
 UID_set : "UID" sequence_set { $q->uid_set($item{sequence_set}) }
-LARGER_number : "LARGER" number { $q->xap_only("bytes:$item{number}..") }
-SMALLER_number : "SMALLER" number { $q->xap_only("bytes:..$item{number}") }
+LARGER_number : "LARGER" number { $q->xap_only("z:$item{number}..") }
+SMALLER_number : "SMALLER" number { $q->xap_only("z:..$item{number}") }
+
+DELETED : "DELETED" { $q->impossible }
+OLD : "OLD" { $q->impossible }
+FLAGGED : "FLAGGED" { $q->impossible }
+DRAFT : "DRAFT" { $q->impossible }
+
 # pass "NOT" through XXX is this right?
 OP_NOT : "NOT" { $q->xap_only('NOT') }
 NOT_search_key : OP_NOT search_key1