GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2026-01-09 03:53:55 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Slight cleanup

Browse source
This commit is contained in:
Luc Mcgrady 2025-11-11 06:29:41 +00:00
parent ddbacbd552
commit df766c2839
No known key found for this signature in database
GPG key ID: 4F3D7A0B17CC3D9C
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -387,9 +387,12 @@ fn add_extract_fsrs_relative_retrievability(db: &Connection) -> rusqlite::Result
let Ok(interval) = ctx.get_raw(2).as_i64() else { let Ok(interval) = ctx.get_raw(2).as_i64() else {
return Ok(None); return Ok(None);
}; };
/*
// Unused
let Ok(next_day_at) = ctx.get_raw(4).as_i64() else { let Ok(next_day_at) = ctx.get_raw(4).as_i64() else {
return Ok(None); return Ok(None);
}; };
*/
let Ok(now) = ctx.get_raw(5).as_i64() else { let Ok(now) = ctx.get_raw(5).as_i64() else {
return Ok(None); return Ok(None);
}; };
@ -401,13 +404,13 @@ fn add_extract_fsrs_relative_retrievability(db: &Connection) -> rusqlite::Result
// in add_extract_fsrs_retrievability // in add_extract_fsrs_retrievability
(now as u32).saturating_sub(due as u32) (now as u32).saturating_sub(due as u32)
} else { } else {
let Ok(today) = ctx.get_raw(3).as_i64() else { // timing.days_elapsed
let Ok(today) = ctx.get_raw(2).as_i64() else {
return Ok(None); return Ok(None);
}; };
let review_day = due.saturating_sub(interval); let review_day = due.saturating_sub(interval);
(today as u32).saturating_sub(review_day as u32) * 86_400 (today as u32).saturating_sub(review_day as u32) * 86_400
}; };
let days_elapsed = secs_elapsed / 86_400;
if let Ok(card_data) = ctx.get_raw(0).as_str() { if let Ok(card_data) = ctx.get_raw(0).as_str() {
if !card_data.is_empty() { if !card_data.is_empty() {
let card_data = &CardData::from_str(card_data); let card_data = &CardData::from_str(card_data);
@ -420,6 +423,9 @@ fn add_extract_fsrs_relative_retrievability(db: &Connection) -> rusqlite::Result
let seconds_elapsed = let seconds_elapsed =
if let Some(last_review_time) = card_data.last_review_time { if let Some(last_review_time) = card_data.last_review_time {
// Don't change this to now.subtracting_sub(due) as u32
// for the same reasons listed in the comment
// in add_extract_fsrs_retrievability
now.saturating_sub(last_review_time.0) as u32 now.saturating_sub(last_review_time.0) as u32
} else { } else {
secs_elapsed secs_elapsed
@ -437,7 +443,7 @@ fn add_extract_fsrs_relative_retrievability(db: &Connection) -> rusqlite::Result
} }
} }
} }
let days_elapsed = secs_elapsed / 86_400;
// FSRS data missing; fall back to SM2 ordering // FSRS data missing; fall back to SM2 ordering
Ok(Some( Ok(Some(
-((days_elapsed as f32) + 0.001) / (interval as f32).max(1.0), -((days_elapsed as f32) + 0.001) / (interval as f32).max(1.0),