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

Save dr and decay in card even if item is None (#4106)

Browse source 
* Document the purpose of storing dr and decay in card

* Format

* Fix type mismatch errors

* Update memory_state.rs

* Save dr and decay in card even if item is None

* Format

* Fix mismatched types

* Update memory_state.rs
This commit is contained in:
user1823 2025-06-21 17:46:54 +05:30 committed by GitHub
parent 88538d8bad
commit c28306eb94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 74 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,77 +105,92 @@ 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();
if let (Some(req), Some(item)) = (&req, item) { if let Some(req) = &req {
card.set_memory_state(&fsrs, Some(item), historical_retention.unwrap())?; // Store decay and desired retention in the card so that add-ons, card info,
// stats and browser search/sorts don't need to access the deck config.
// Unlike memory states, scheduler doesn't use decay and dr stored in the card.
card.desired_retention = desired_retention; card.desired_retention = desired_retention;
card.decay = decay; card.decay = decay;
// if rescheduling if let Some(item) = item {
if let Some(reviews) = &last_revlog_info { card.set_memory_state(&fsrs, Some(item), historical_retention.unwrap())?;
// and we have a last review time for the card // if rescheduling
if let Some(last_info) = reviews.get(&card.id) { if let Some(reviews) = &last_revlog_info {
if let Some(last_review) = &last_info.last_reviewed_at { // and we have a last review time for the card
let days_elapsed = if let Some(last_info) = reviews.get(&card.id) {
timing.next_day_at.elapsed_days_since(*last_review) as i32; if let Some(last_review) = &last_info.last_reviewed_at {
// and the card's not new let days_elapsed =
if let Some(state) = &card.memory_state { timing.next_day_at.elapsed_days_since(*last_review) as i32;
// or in (re)learning // and the card's not new
if card.ctype == CardType::Review { if let Some(state) = &card.memory_state {
let deck = self // or in (re)learning
.get_deck(card.original_or_current_deck_id())? if card.ctype == CardType::Review {
.or_not_found(card.original_or_current_deck_id())?; let deck = self
let deckconfig_id = deck.config_id().unwrap(); .get_deck(card.original_or_current_deck_id())?
// reschedule it .or_not_found(card.original_or_current_deck_id())?;
let original_interval = card.interval; let deckconfig_id = deck.config_id().unwrap();
let interval = fsrs.next_interval( // reschedule it
Some(state.stability), let original_interval = card.interval;
card.desired_retention.unwrap(), let interval = fsrs.next_interval(
0, Some(state.stability),
); desired_retention.unwrap(),
card.interval = rescheduler 0,
.as_mut()
.and_then(|r| {
r.find_interval(
interval,
1,
req.max_interval,
days_elapsed as u32,
deckconfig_id,
get_fuzz_seed(&card, true),
)
})
.unwrap_or_else(|| {
with_review_fuzz(
card.get_fuzz_factor(true),
interval,
1,
req.max_interval,
)
});
let due = if card.original_due != 0 {
&mut card.original_due
} else {
&mut card.due
};
let new_due = (timing.days_elapsed as i32) - days_elapsed
+ card.interval as i32;
if let Some(rescheduler) = &mut rescheduler {
rescheduler.update_due_cnt_per_day(
*due,
new_due,
deckconfig_id,
); );
card.interval = rescheduler
.as_mut()
.and_then(|r| {
r.find_interval(
interval,
1,
req.max_interval,
days_elapsed as u32,
deckconfig_id,
get_fuzz_seed(&card, true),
)
})
.unwrap_or_else(|| {
with_review_fuzz(
card.get_fuzz_factor(true),
interval,
1,
req.max_interval,
)
});
let due = if card.original_due != 0 {
&mut card.original_due
} else {
&mut card.due
};
let new_due = (timing.days_elapsed as i32)
- days_elapsed
+ card.interval as i32;
if let Some(rescheduler) = &mut rescheduler {
rescheduler.update_due_cnt_per_day(
*due,
new_due,
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 {
// clear memory states if item is None
card.memory_state = None;
} }
} else { } else {
// clear FSRS data if FSRS is disabled
card.memory_state = None; card.memory_state = None;
card.desired_retention = None; card.desired_retention = None;
card.decay = None;
} }
self.update_card_inner(&mut card, original, usn)?; self.update_card_inner(&mut card, original, usn)?;
} }
@ -213,8 +228,6 @@ impl Collection {
decay, decay,
}) })
} else { } else {
card.memory_state = None;
card.desired_retention = None;
Ok(ComputeMemoryStateResponse { Ok(ComputeMemoryStateResponse {
state: None, state: None,
desired_retention, desired_retention,