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

Respect intermediate child limits in v3

Browse source
This commit is contained in:
RumovZ 2022-01-28 15:54:42 +01:00
parent 11f5bdf5c7
commit bb4cbfe26e
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rslib/src/decks/tree.rs
View file

@ -216,20 +216,17 @@ fn sum_counts_and_apply_limits_v3(
for child in &mut node.children { for child in &mut node.children {
individually_capped_total += sum_counts_and_apply_limits_v3(child, limits); individually_capped_total += sum_counts_and_apply_limits_v3(child, limits);
} }
// so we can calculate this total
node.total_including_children = individually_capped_total.total; node.total_including_children = individually_capped_total.total;
// We already have a sum of the current deck's capped cards+its child decks' // now cap again to obtain the final counts
// capped cards, which we'll return to the parent. But because clicking on a
// given deck imposes that deck's limits on the total number of cards shown,
// the sum we'll display needs to be capped again by the limits of the current
// deck.
let total_constrained_by_current_deck = individually_capped_total.capped(&remaining); let total_constrained_by_current_deck = individually_capped_total.capped(&remaining);
node.new_count = total_constrained_by_current_deck.new; node.new_count = total_constrained_by_current_deck.new;
node.review_count = total_constrained_by_current_deck.review; node.review_count = total_constrained_by_current_deck.review;
node.learn_count = total_constrained_by_current_deck.intraday_learning node.learn_count = total_constrained_by_current_deck.intraday_learning
+ total_constrained_by_current_deck.interday_learning; + total_constrained_by_current_deck.interday_learning;
individually_capped_total total_constrained_by_current_deck
} }
fn hide_default_deck(node: &mut DeckTreeNode) { fn hide_default_deck(node: &mut DeckTreeNode) {