From 155a59b80b41fd8af6d77e32bc3cb07641f2b865 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Thu, 7 Jan 2021 19:01:10 +0100 Subject: [PATCH] Search for Learn and PreviewRepeat cards when using prop:due --- rslib/src/search/sqlwriter.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rslib/src/search/sqlwriter.rs b/rslib/src/search/sqlwriter.rs index 8a7fa2329..cfa749bf3 100644 --- a/rslib/src/search/sqlwriter.rs +++ b/rslib/src/search/sqlwriter.rs @@ -235,16 +235,24 @@ impl SqlWriter<'_> { fn write_prop(&mut self, op: &str, kind: &PropertyKind) -> Result<()> { let timing = self.col.timing_today()?; + match kind { PropertyKind::Due(days) => { let day = days + (timing.days_elapsed as i32); write!( self.sql, - "(c.queue in ({rev},{daylrn}) and due {op} {day})", + "( + (c.queue in ({rev},{daylrn}) and c.due {op} {day}) or + (c.queue in ({lrn},{previewrepeat}) and ((c.due - {cutoff}) / 86400) {op} {days}) + )", rev = CardQueue::Review as u8, daylrn = CardQueue::DayLearn as u8, op = op, - day = day + day = day, + lrn = CardQueue::Learn as i8, + previewrepeat = CardQueue::PreviewRepeat as i8, + cutoff = timing.next_day_at, + days = days ) } PropertyKind::Position(pos) => {