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

fix

Browse source
This commit is contained in:
user1823 2025-12-17 15:11:21 +05:30
parent 4952222f3e
commit 80b0c7b7a8
1 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -800,15 +800,12 @@ pub(crate) enum ReviewOrderSubclause {
DifficultyAscending, DifficultyAscending,
/// FSRS /// FSRS
DifficultyDescending, DifficultyDescending,
RetrievabilitySm2 {
today: u32,
order: SqlSortOrder,
},
RetrievabilityFsrs { RetrievabilityFsrs {
timing: SchedTimingToday, timing: SchedTimingToday,
order: SqlSortOrder, order: SqlSortOrder,
}, },
RelativeOverdueness { RelativeOverdueness {
fsrs: bool,
timing: SchedTimingToday, timing: SchedTimingToday,
}, },
Added, Added,
@ -828,13 +825,6 @@ impl fmt::Display for ReviewOrderSubclause {
ReviewOrderSubclause::EaseDescending => "factor desc", ReviewOrderSubclause::EaseDescending => "factor desc",
ReviewOrderSubclause::DifficultyAscending => "extract_fsrs_variable(data, 'd') asc", ReviewOrderSubclause::DifficultyAscending => "extract_fsrs_variable(data, 'd') asc",
ReviewOrderSubclause::DifficultyDescending => "extract_fsrs_variable(data, 'd') desc", ReviewOrderSubclause::DifficultyDescending => "extract_fsrs_variable(data, 'd') desc",
ReviewOrderSubclause::RetrievabilitySm2 { today, order } => {
temp_string = format!(
// - (elapsed days+0.001)/(scheduled interval)
"-(1 + cast({today}-due+0.001 as real)/ivl) {order}"
);
&temp_string
}
ReviewOrderSubclause::RetrievabilityFsrs { timing, order } => { ReviewOrderSubclause::RetrievabilityFsrs { timing, order } => {
let today = timing.days_elapsed; let today = timing.days_elapsed;
let next_day_at = timing.next_day_at.0; let next_day_at = timing.next_day_at.0;
@ -843,12 +833,18 @@ impl fmt::Display for ReviewOrderSubclause {
format!("extract_fsrs_retrievability(data, case when odue !=0 then odue else due end, ivl, {today}, {next_day_at}, {now}) {order}"); format!("extract_fsrs_retrievability(data, case when odue !=0 then odue else due end, ivl, {today}, {next_day_at}, {now}) {order}");
&temp_string &temp_string
} }
ReviewOrderSubclause::RelativeOverdueness { timing } => { ReviewOrderSubclause::RelativeOverdueness { fsrs, timing } => {
let today = timing.days_elapsed; let today = timing.days_elapsed;
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 = if *fsrs {
format!("extract_fsrs_relative_retrievability(data, case when odue !=0 then odue else due end, ivl, {today}, {next_day_at}, {now}) asc"); format!("extract_fsrs_relative_retrievability(data, case when odue !=0 then odue else due end, ivl, {today}, {next_day_at}, {now}) asc")
} else {
format!(
// - (elapsed days+0.001)/(scheduled interval)
"-(1 + cast({today}-due+0.001 as real)/ivl) asc"
)
};
&temp_string &temp_string
} }
ReviewOrderSubclause::Added => "nid asc, ord asc", ReviewOrderSubclause::Added => "nid asc, ord asc",
@ -878,13 +874,19 @@ fn review_order_sql(order: ReviewCardOrder, timing: SchedTimingToday, fsrs: bool
ReviewOrderSubclause::EaseDescending ReviewOrderSubclause::EaseDescending
}], }],
ReviewCardOrder::RetrievabilityAscending => { ReviewCardOrder::RetrievabilityAscending => {
build_retrievability_clauses(fsrs, timing, SqlSortOrder::Ascending) vec![ReviewOrderSubclause::RetrievabilityFsrs {
timing,
order: SqlSortOrder::Ascending,
}]
} }
ReviewCardOrder::RetrievabilityDescending => { ReviewCardOrder::RetrievabilityDescending => {
build_retrievability_clauses(fsrs, timing, SqlSortOrder::Descending) vec![ReviewOrderSubclause::RetrievabilityFsrs {
timing,
order: SqlSortOrder::Descending,
}]
} }
ReviewCardOrder::RelativeOverdueness => { ReviewCardOrder::RelativeOverdueness => {
vec![ReviewOrderSubclause::RelativeOverdueness { timing }] vec![ReviewOrderSubclause::RelativeOverdueness { fsrs, timing }]
} }
ReviewCardOrder::Random => vec![], ReviewCardOrder::Random => vec![],
ReviewCardOrder::Added => vec![ReviewOrderSubclause::Added], ReviewCardOrder::Added => vec![ReviewOrderSubclause::Added],
@ -899,21 +901,6 @@ fn review_order_sql(order: ReviewCardOrder, timing: SchedTimingToday, fsrs: bool
v.join(", ") v.join(", ")
} }
fn build_retrievability_clauses(
fsrs: bool,
timing: SchedTimingToday,
order: SqlSortOrder,
) -> Vec<ReviewOrderSubclause> {
vec![if fsrs {
ReviewOrderSubclause::RetrievabilityFsrs { timing, order }
} else {
ReviewOrderSubclause::RetrievabilitySm2 {
today: timing.days_elapsed,
order,
}
}]
}
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub(crate) enum NewCardSorting { pub(crate) enum NewCardSorting {
/// Ascending position, consecutive siblings, /// Ascending position, consecutive siblings,