GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-21 07:22:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

add timing to search

Browse source
This commit is contained in:
Damien Elmes 2020-03-18 12:00:23 +10:00
parent 2beccd377b
commit dc12c23ce9
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
rslib/src/search/searcher.rs
View file

@ -68,10 +68,10 @@ fn write_search_node_to_sql(ctx: &mut SearchContext, node: &SearchNode) -> Resul
write!(ctx.sql, "n.mid = {}", ntid).unwrap(); write!(ctx.sql, "n.mid = {}", ntid).unwrap();
} }
SearchNode::NoteType(notetype) => write_note_type(ctx, notetype.as_ref()), SearchNode::NoteType(notetype) => write_note_type(ctx, notetype.as_ref()),
SearchNode::Rated { days, ease } => write_rated(ctx, *days, *ease), SearchNode::Rated { days, ease } => write_rated(ctx, *days, *ease)?,
SearchNode::Tag(tag) => write_tag(ctx, tag), SearchNode::Tag(tag) => write_tag(ctx, tag),
SearchNode::Duplicates { note_type_id, text } => write_dupes(ctx, *note_type_id, text), SearchNode::Duplicates { note_type_id, text } => write_dupes(ctx, *note_type_id, text),
SearchNode::State(state) => write_state(ctx, state), SearchNode::State(state) => write_state(ctx, state)?,
SearchNode::Flag(flag) => { SearchNode::Flag(flag) => {
write!(ctx.sql, "(c.flags & 7) == {}", flag).unwrap(); write!(ctx.sql, "(c.flags & 7) == {}", flag).unwrap();
} }
@ -81,7 +81,7 @@ fn write_search_node_to_sql(ctx: &mut SearchContext, node: &SearchNode) -> Resul
SearchNode::CardIDs(cids) => { SearchNode::CardIDs(cids) => {
write!(ctx.sql, "c.id in ({})", cids).unwrap(); write!(ctx.sql, "c.id in ({})", cids).unwrap();
} }
SearchNode::Property { operator, kind } => write_prop(ctx, operator, kind), SearchNode::Property { operator, kind } => write_prop(ctx, operator, kind)?,
}; };
Ok(()) Ok(())
} }
@ -109,10 +109,9 @@ fn write_tag(ctx: &mut SearchContext, text: &str) {
ctx.args.push(tag.into()); ctx.args.push(tag.into());
} }
// fixme: need day cutoff fn write_rated(ctx: &mut SearchContext, days: u32, ease: Option<u8>) -> Result<()> {
fn write_rated(ctx: &mut SearchContext, days: u32, ease: Option<u8>) { let today_cutoff = ctx.ctx.storage.timing_today()?.next_day_at;
let today_cutoff = 0; // fixme let days = days.min(31) as i64;
let days = days.min(31);
let target_cutoff = today_cutoff - 86_400 * days; let target_cutoff = today_cutoff - 86_400 * days;
write!( write!(
ctx.sql, ctx.sql,
@ -125,13 +124,15 @@ fn write_rated(ctx: &mut SearchContext, days: u32, ease: Option<u8>) {
} else { } else {
write!(ctx.sql, ")").unwrap(); write!(ctx.sql, ")").unwrap();
} }
Ok(())
} }
// fixme: need current day fn write_prop(ctx: &mut SearchContext, op: &str, kind: &PropertyKind) -> Result<()> {
fn write_prop(ctx: &mut SearchContext, op: &str, kind: &PropertyKind) { let timing = ctx.ctx.storage.timing_today()?;
match kind { match kind {
PropertyKind::Due(days) => { PropertyKind::Due(days) => {
let day = days; // fixme: + sched_today let day = days + (timing.days_elapsed as i32);
write!( write!(
ctx.sql, ctx.sql,
"(c.queue in ({rev},{daylrn}) and due {op} {day})", "(c.queue in ({rev},{daylrn}) and due {op} {day})",
@ -147,10 +148,11 @@ fn write_prop(ctx: &mut SearchContext, op: &str, kind: &PropertyKind) {
PropertyKind::Ease(ease) => write!(ctx.sql, "ease {} {}", op, (ease * 1000.0) as u32), PropertyKind::Ease(ease) => write!(ctx.sql, "ease {} {}", op, (ease * 1000.0) as u32),
} }
.unwrap(); .unwrap();
Ok(())
} }
// fixme: need cutoff & current day fn write_state(ctx: &mut SearchContext, state: &StateKind) -> Result<()> {
fn write_state(ctx: &mut SearchContext, state: &StateKind) { let timing = ctx.ctx.storage.timing_today()?;
match state { match state {
StateKind::New => write!(ctx.sql, "c.queue = {}", CardQueue::New as u8), StateKind::New => write!(ctx.sql, "c.queue = {}", CardQueue::New as u8),
StateKind::Review => write!(ctx.sql, "c.queue = {}", CardQueue::Review as u8), StateKind::Review => write!(ctx.sql, "c.queue = {}", CardQueue::Review as u8),
@ -167,23 +169,20 @@ fn write_state(ctx: &mut SearchContext, state: &StateKind) {
CardQueue::UserBuried as u8 CardQueue::UserBuried as u8
), ),
StateKind::Suspended => write!(ctx.sql, "c.queue = {}", CardQueue::Suspended as u8), StateKind::Suspended => write!(ctx.sql, "c.queue = {}", CardQueue::Suspended as u8),
StateKind::Due => { StateKind::Due => write!(
let today = 0; // fixme: today ctx.sql,
let day_cutoff = 0; // fixme: day_cutoff "
write!(
ctx.sql,
"
(c.queue in ({rev},{daylrn}) and c.due <= {today}) or (c.queue in ({rev},{daylrn}) and c.due <= {today}) or
(c.queue = {lrn} and c.due <= {daycutoff})", (c.queue = {lrn} and c.due <= {daycutoff})",
rev = CardQueue::Review as u8, rev = CardQueue::Review as u8,
daylrn = CardQueue::DayLearn as u8, daylrn = CardQueue::DayLearn as u8,
today = today, today = timing.days_elapsed,
lrn = CardQueue::Learn as u8, lrn = CardQueue::Learn as u8,
daycutoff = day_cutoff, daycutoff = timing.next_day_at,
) ),
}
} }
.unwrap() .unwrap();
Ok(())
} }
fn write_deck(ctx: &mut SearchContext, deck: &str) -> Result<()> { fn write_deck(ctx: &mut SearchContext, deck: &str) -> Result<()> {