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

Save dr and decay in card even if item is None

Browse source
This commit is contained in:
user1823 2025-06-21 13:22:03 +05:30 committed by GitHub
parent 94ccc3c4c6
commit f5ca591f41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 48 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
rslib/src/scheduler/fsrs/memory_state.rs
View file

@ -105,36 +105,37 @@ impl Collection {
progress.update(true, |state| state.current_cards = idx as u32 + 1)?; progress.update(true, |state| state.current_cards = idx as u32 + 1)?;
let mut card = self.storage.get_card(card_id)?.or_not_found(card_id)?; let mut card = self.storage.get_card(card_id)?.or_not_found(card_id)?;
let original = card.clone(); let original = card.clone();
// store decay and desired retention in the card so that add-ons, card info, if let Some(req) = &req {
// Stats and browser search/sorts don't need to access the deck config. // Store decay and desired retention in the card so that add-ons, card info,
// Values stored in the card are not used by the scheduler. // stats and browser search/sorts don't need to access the deck config.
card.desired_retention = desired_retention; // Unlike memory states, scheduler doesn't use decay and dr stored in the card.
card.decay = decay; card.desired_retention = desired_retention;
if let (Some(req), Some(item)) = (&req, item) { card.decay = decay;
card.set_memory_state(&fsrs, Some(item), historical_retention.unwrap())?; if let Some(item) = &item {
// if rescheduling card.set_memory_state(&fsrs, Some(item), historical_retention.unwrap())?;
if let Some(reviews) = &last_revlog_info { // if rescheduling
// and we have a last review time for the card if let Some(reviews) = &last_revlog_info {
if let Some(last_info) = reviews.get(&card.id) { // and we have a last review time for the card
if let Some(last_review) = &last_info.last_reviewed_at { if let Some(last_info) = reviews.get(&card.id) {
let days_elapsed = if let Some(last_review) = &last_info.last_reviewed_at {
let days_elapsed =
timing.next_day_at.elapsed_days_since(*last_review) as i32; timing.next_day_at.elapsed_days_since(*last_review) as i32;
// and the card's not new // and the card's not new
if let Some(state) = &card.memory_state { if let Some(state) = &card.memory_state {
// or in (re)learning // or in (re)learning
if card.ctype == CardType::Review { if card.ctype == CardType::Review {
let deck = self let deck = self
.get_deck(card.original_or_current_deck_id())? .get_deck(card.original_or_current_deck_id())?
.or_not_found(card.original_or_current_deck_id())?; .or_not_found(card.original_or_current_deck_id())?;
let deckconfig_id = deck.config_id().unwrap(); let deckconfig_id = deck.config_id().unwrap();
// reschedule it // reschedule it
let original_interval = card.interval; let original_interval = card.interval;
let interval = fsrs.next_interval( let interval = fsrs.next_interval(
Some(state.stability), Some(state.stability),
desired_retention.unwrap(), desired_retention.unwrap(),
0, 0,
); );
card.interval = rescheduler card.interval = rescheduler
.as_mut() .as_mut()
.and_then(|r| { .and_then(|r| {
r.find_interval( r.find_interval(
@ -154,31 +155,38 @@ impl Collection {
req.max_interval, req.max_interval,
) )
}); });
let due = if card.original_due != 0 { let due = if card.original_due != 0 {
&mut card.original_due &mut card.original_due
} else { } else {
&mut card.due &mut card.due
}; };
let new_due = (timing.days_elapsed as i32) - days_elapsed let new_due = (timing.days_elapsed as i32) - days_elapsed
+ card.interval as i32; + card.interval as i32;
if let Some(rescheduler) = &mut rescheduler { if let Some(rescheduler) = &mut rescheduler {
rescheduler.update_due_cnt_per_day( rescheduler.update_due_cnt_per_day(
*due, *due,
new_due, new_due,
deckconfig_id, deckconfig_id,
); );
}
*due = new_due;
// Add a rescheduled revlog entry
self.log_rescheduled_review(&card, original_interval, usn)?;
} }
*due = new_due;
// Add a rescheduled revlog entry
self.log_rescheduled_review(&card, original_interval, usn)?;
} }
} }
} }
} }
}
} else { } else {
// clear memory states if item is None
card.memory_state = None; card.memory_state = None;
} }
} else {
// clear FSRS data if FSRS is disabled
card.memory_state = None;
card.desired_retention = None;
card.decay = None;
}
self.update_card_inner(&mut card, original, usn)?; self.update_card_inner(&mut card, original, usn)?;
} }
} }
@ -215,8 +223,6 @@ impl Collection {
decay, decay,
}) })
} else { } else {
card.memory_state = None;
card.desired_retention = Some(desired_retention);
Ok(ComputeMemoryStateResponse { Ok(ComputeMemoryStateResponse {
state: None, state: None,
desired_retention, desired_retention,