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

Fix/fallback to non-manual entry when first_of_last_learn_entries non found

Browse source
This commit is contained in:
Jarrett Ye 2024-12-15 16:45:46 +08:00
parent d900506003
commit e04b382666
No known key found for this signature in database
GPG key ID: EBFC55E0C1A352BB
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rslib/src/scheduler/fsrs/params.rs
View file

@ -260,8 +260,12 @@ pub(crate) fn single_card_revlog_to_items(
ignore_revlogs_before: TimestampMillis, ignore_revlogs_before: TimestampMillis,
) -> Option<(Vec<FSRSItem>, bool, usize)> { ) -> Option<(Vec<FSRSItem>, bool, usize)> {
let mut first_of_last_learn_entries = None; let mut first_of_last_learn_entries = None;
let mut non_manual_entries = None;
let mut revlogs_complete = false; let mut revlogs_complete = false;
for (index, entry) in entries.iter().enumerate().rev() { for (index, entry) in entries.iter().enumerate().rev() {
if matches!(entry.button_chosen, 1..=4) {
non_manual_entries = Some(entry);
}
if matches!( if matches!(
(entry.review_kind, entry.button_chosen), (entry.review_kind, entry.button_chosen),
(RevlogReviewKind::Learning, 1..=4) (RevlogReviewKind::Learning, 1..=4)
@ -274,13 +278,18 @@ pub(crate) fn single_card_revlog_to_items(
(entry.review_kind, entry.ease_factor), (entry.review_kind, entry.ease_factor),
(RevlogReviewKind::Manual, 0) (RevlogReviewKind::Manual, 0)
) { ) {
// If we find a `Learn` entry after the `Forget` entry, we should // If we find a `Learn` entry after the `Reset` entry, we should
// ignore the entries before the `Forget` entry // ignore the entries before the `Reset` entry
if first_of_last_learn_entries.is_some() { if first_of_last_learn_entries.is_some() {
revlogs_complete = true;
break;
// If we find a non-manual entry after the `Reset` entry, we should
// ignore the entries before the `Reset` entry
} else if non_manual_entries.is_some() {
revlogs_complete = false; revlogs_complete = false;
break; break;
// If we don't find a `Learn` entry after the `Forget` entry, it's // If we don't find any non-manual entry after the `Reset` entry,
// a new card and we should ignore all entries // it's a new card and we should ignore all entries
} else { } else {
return None; return None;
} }