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

Apply code diff changes

Browse source 
Co-authored-by: user1823 <92206575+user1823@users.noreply.github.com>
This commit is contained in:
Luc Mcgrady 2025-11-11 06:15:58 +00:00
parent 5ecbb0cd72
commit ddbacbd552
No known key found for this signature in database
GPG key ID: 4F3D7A0B17CC3D9C
3 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rslib/src/storage/card/filtered.rs
View file

@ -54,7 +54,7 @@ fn build_retrievability_query(
) -> String { ) -> String {
if fsrs { if fsrs {
format!( format!(
"extract_fsrs_relative_retrievability(c.data, case when c.odue !=0 then c.odue else c.due end, {today}, ivl, {next_day_at}, {now}) {order}" "extract_fsrs_relative_retrievability(c.data, case when c.odue !=0 then c.odue else c.due end, ivl, {today}, {next_day_at}, {now}) {order}"
) )
} else { } else {
format!( format!(

2
rslib/src/storage/card/mod.rs
View file

@ -837,7 +837,7 @@ impl fmt::Display for ReviewOrderSubclause {
let next_day_at = timing.next_day_at.0; let next_day_at = timing.next_day_at.0;
let now = timing.now.0; let now = timing.now.0;
temp_string = temp_string =
format!("extract_fsrs_relative_retrievability(data, case when odue !=0 then odue else due end, {today}, ivl, {next_day_at}, {now}) {order}"); format!("extract_fsrs_relative_retrievability(data, case when odue !=0 then odue else due end, ivl, {today}, {next_day_at}, {now}) {order}");
&temp_string &temp_string
} }
ReviewOrderSubclause::Added => "nid asc, ord asc", ReviewOrderSubclause::Added => "nid asc, ord asc",

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

@ -350,11 +350,11 @@ fn add_extract_fsrs_retrievability(db: &Connection) -> rusqlite::Result<()> {
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);
}; };
let Ok(days_elapsed) = ctx.get_raw(3).as_i64() else { let Ok(today) = ctx.get_raw(3).as_i64() else {
return Ok(None); return Ok(None);
}; };
let review_day = (due as u32).saturating_sub(ivl as u32); let review_day = (due as u32).saturating_sub(ivl as u32);
(days_elapsed as u32).saturating_sub(review_day) * 86_400 (today as u32).saturating_sub(review_day) * 86_400
}; };
let decay = card_data.decay.unwrap_or(FSRS5_DEFAULT_DECAY); let decay = card_data.decay.unwrap_or(FSRS5_DEFAULT_DECAY);
let retrievability = card_data.memory_state().map(|state| { let retrievability = card_data.memory_state().map(|state| {
@ -370,7 +370,7 @@ fn add_extract_fsrs_retrievability(db: &Connection) -> rusqlite::Result<()> {
} }
/// eg. extract_fsrs_relative_retrievability(card.data, card.due, /// eg. extract_fsrs_relative_retrievability(card.data, card.due,
/// timing.days_elapsed, card.ivl, timing.next_day_at, timing.now) -> float | /// card.ivl, timing.days_elapsed, timing.next_day_at, timing.now) -> float |
/// null. The higher the number, the higher the card's retrievability relative /// null. The higher the number, the higher the card's retrievability relative
/// to the configured desired retention. /// to the configured desired retention.
fn add_extract_fsrs_relative_retrievability(db: &Connection) -> rusqlite::Result<()> { fn add_extract_fsrs_relative_retrievability(db: &Connection) -> rusqlite::Result<()> {
@ -384,7 +384,7 @@ fn add_extract_fsrs_relative_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);
}; };
let Ok(interval) = ctx.get_raw(3).as_i64() else { let Ok(interval) = ctx.get_raw(2).as_i64() else {
return Ok(None); return Ok(None);
}; };
let Ok(next_day_at) = ctx.get_raw(4).as_i64() else { let Ok(next_day_at) = ctx.get_raw(4).as_i64() else {
@ -393,17 +393,21 @@ fn add_extract_fsrs_relative_retrievability(db: &Connection) -> rusqlite::Result
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);
}; };
let days_elapsed = if due > 365_000 { let secs_elapsed = if due > 365_000 {
// (re)learning // (re)learning card with due in seconds
(next_day_at as u32).saturating_sub(due as u32) / 86_400
// 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 as u32).saturating_sub(due as u32)
} else { } else {
let Ok(days_elapsed) = ctx.get_raw(2).as_i64() else { let Ok(today) = ctx.get_raw(3).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
(days_elapsed as u32).saturating_sub(review_day as u32)
}; };
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);
@ -417,25 +421,8 @@ 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 {
now.saturating_sub(last_review_time.0) as u32 now.saturating_sub(last_review_time.0) as u32
} else if due > 365_000 {
// (re)learning card in seconds
let Ok(ivl) = ctx.get_raw(2).as_i64() else {
return Ok(None);
};
// Don't change this to now.subtracting_sub(last_review_time) as u32
// for the same reasons listed in the comment
// in add_extract_fsrs_retrievability
let last_review_time = due.saturating_sub(ivl) as u32;
(now as u32).saturating_sub(last_review_time)
} else { } else {
let Ok(ivl) = ctx.get_raw(2).as_i64() else { secs_elapsed
return Ok(None);
};
let Ok(days_elapsed) = ctx.get_raw(3).as_i64() else {
return Ok(None);
};
let review_day = due.saturating_sub(ivl);
days_elapsed.saturating_sub(review_day) as u32 * 86_400
}; };
let current_retrievability = FSRS::new(None) let current_retrievability = FSRS::new(None)