From ac6397ae9efaa08859b7e1af9d8bda182d29a12c Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 29 Aug 2020 21:59:30 +1000 Subject: [PATCH] add separate sched/user bury searches, and fix bury enums --- rslib/src/card.rs | 4 ++-- rslib/src/search/parser.rs | 4 ++++ rslib/src/search/sqlwriter.rs | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rslib/src/card.rs b/rslib/src/card.rs index c38c0c046..7db495bdb 100644 --- a/rslib/src/card.rs +++ b/rslib/src/card.rs @@ -45,8 +45,8 @@ pub enum CardQueue { PreviewRepeat = 4, /// cards are not due in these states Suspended = -1, - UserBuried = -2, - SchedBuried = -3, + SchedBuried = -2, + UserBuried = -3, } #[derive(Debug, Clone, PartialEq)] diff --git a/rslib/src/search/parser.rs b/rslib/src/search/parser.rs index d160a5c69..70e33f08d 100644 --- a/rslib/src/search/parser.rs +++ b/rslib/src/search/parser.rs @@ -105,6 +105,8 @@ pub(super) enum StateKind { Learning, Due, Buried, + UserBuried, + SchedBuried, Suspended, } @@ -317,6 +319,8 @@ fn parse_state(s: &str) -> ParseResult> { "learn" => Learning, "due" => Due, "buried" => Buried, + "buried-manually" => UserBuried, + "buried-sibling" => SchedBuried, "suspended" => Suspended, _ => return Err(ParseError {}), })) diff --git a/rslib/src/search/sqlwriter.rs b/rslib/src/search/sqlwriter.rs index 5b24f6453..385fe71f8 100644 --- a/rslib/src/search/sqlwriter.rs +++ b/rslib/src/search/sqlwriter.rs @@ -289,6 +289,10 @@ impl SqlWriter<'_> { lrn = CardQueue::Learn as i8, daycutoff = timing.next_day_at, ), + StateKind::UserBuried => write!(self.sql, "c.queue = {}", CardQueue::UserBuried as i8), + StateKind::SchedBuried => { + write!(self.sql, "c.queue = {}", CardQueue::SchedBuried as i8) + } } .unwrap(); Ok(())