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

Support retrievability calculation for (re)learning cards

Browse source
This commit is contained in:
Damien Elmes 2023-09-25 14:58:39 +10:00
parent da0e42ea03
commit bb0acd9d92
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rslib/src/browser_table.rs
View file

@ -121,6 +121,9 @@ impl Card {
} }
pub(crate) fn days_since_last_review(&self, timing: &SchedTimingToday) -> Option<u32> { pub(crate) fn days_since_last_review(&self, timing: &SchedTimingToday) -> Option<u32> {
if !self.is_due_in_days() {
Some(0)
} else {
self.due_time(timing).map(|due| { self.due_time(timing).map(|due| {
due.adding_secs(-86_400 * self.interval as i64) due.adding_secs(-86_400 * self.interval as i64)
.elapsed_secs() .elapsed_secs()
@ -129,6 +132,7 @@ impl Card {
}) })
} }
} }
}
impl Note { impl Note {
fn is_marked(&self) -> bool { fn is_marked(&self) -> bool {

11
rslib/src/storage/sqlite.rs
View file

@ -285,10 +285,10 @@ fn add_extract_fsrs_retrievability(db: &Connection) -> rusqlite::Result<()> {
let Ok(due) = ctx.get_raw(1).as_i64() else { let Ok(due) = ctx.get_raw(1).as_i64() else {
return Ok(None); return Ok(None);
}; };
if due > 365_000 { let days_elapsed = if due > 365_000 {
// learning card // (re)learning card, assume 0 days have elapsed
return Ok(None); 0
} } else {
let Ok(ivl) = ctx.get_raw(2).as_i64() else { let Ok(ivl) = ctx.get_raw(2).as_i64() else {
return Ok(None); return Ok(None);
}; };
@ -296,7 +296,8 @@ fn add_extract_fsrs_retrievability(db: &Connection) -> rusqlite::Result<()> {
return Ok(None); return Ok(None);
}; };
let review_day = (due.max(0) as u32).saturating_sub(ivl as u32); let review_day = (due.max(0) as u32).saturating_sub(ivl as u32);
let days_elapsed = (days_elapsed.max(0) as u32).saturating_sub(review_day); (days_elapsed.max(0) as u32).saturating_sub(review_day)
};
Ok(card_data.memory_state().map(|state| { Ok(card_data.memory_state().map(|state| {
FSRS::new(None) FSRS::new(None)
.unwrap() .unwrap()