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

target[_id]s → existing_card[_id]s

Browse source
This commit is contained in:
RumovZ 2022-04-27 21:48:19 +02:00
parent 07ff01f96d
commit 60c6869a05
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
rslib/src/import_export/package/apkg/import/cards.rs
View file

@ -14,6 +14,8 @@ use crate::{
revlog::RevlogEntry, revlog::RevlogEntry,
}; };
type CardAsNidAndOrd = (NoteId, u16);
struct CardContext<'a> { struct CardContext<'a> {
target_col: &'a mut Collection, target_col: &'a mut Collection,
usn: Usn, usn: Usn,
@ -24,10 +26,8 @@ struct CardContext<'a> {
/// The number of days the source collection is ahead of the target collection /// The number of days the source collection is ahead of the target collection
collection_delta: i32, collection_delta: i32,
scheduler_version: SchedulerVersion, scheduler_version: SchedulerVersion,
/// Cards in the target collection as (nid, ord) existing_cards: HashSet<CardAsNidAndOrd>,
targets: HashSet<(NoteId, u16)>, existing_card_ids: HashSet<CardId>,
/// All card ids existing in the target collection
target_ids: HashSet<CardId>,
imported_cards: HashMap<CardId, CardId>, imported_cards: HashMap<CardId, CardId>,
} }
@ -40,19 +40,19 @@ impl<'c> CardContext<'c> {
imported_notes: &'a HashMap<NoteId, NoteId>, imported_notes: &'a HashMap<NoteId, NoteId>,
imported_decks: &'a HashMap<DeckId, DeckId>, imported_decks: &'a HashMap<DeckId, DeckId>,
) -> Result<Self> { ) -> Result<Self> {
let targets = target_col.storage.all_cards_as_nid_and_ord()?; let existing_cards = target_col.storage.all_cards_as_nid_and_ord()?;
let collection_delta = target_col.collection_delta(days_elapsed)?; let collection_delta = target_col.collection_delta(days_elapsed)?;
let scheduler_version = target_col.scheduler_info()?.version; let scheduler_version = target_col.scheduler_info()?.version;
let target_ids = target_col.storage.get_all_card_ids()?; let existing_card_ids = target_col.storage.get_all_card_ids()?;
Ok(Self { Ok(Self {
target_col, target_col,
usn, usn,
imported_notes, imported_notes,
remapped_decks: imported_decks, remapped_decks: imported_decks,
targets, existing_cards,
collection_delta, collection_delta,
scheduler_version, scheduler_version,
target_ids, existing_card_ids,
imported_cards: HashMap::new(), imported_cards: HashMap::new(),
}) })
} }
@ -115,7 +115,8 @@ impl CardContext<'_> {
} }
fn target_already_exists(&self, card: &Card) -> bool { fn target_already_exists(&self, card: &Card) -> bool {
self.targets.contains(&(card.note_id, card.template_idx)) self.existing_cards
.contains(&(card.note_id, card.template_idx))
} }
fn add_card(&mut self, card: &mut Card) -> Result<()> { fn add_card(&mut self, card: &mut Card) -> Result<()> {
@ -126,7 +127,7 @@ impl CardContext<'_> {
let old_id = self.uniquify_card_id(card); let old_id = self.uniquify_card_id(card);
self.target_col.add_card_if_unique_undoable(card)?; self.target_col.add_card_if_unique_undoable(card)?;
self.target_ids.insert(card.id); self.existing_card_ids.insert(card.id);
self.imported_cards.insert(old_id, card.id); self.imported_cards.insert(old_id, card.id);
Ok(()) Ok(())
@ -134,7 +135,7 @@ impl CardContext<'_> {
fn uniquify_card_id(&mut self, card: &mut Card) -> CardId { fn uniquify_card_id(&mut self, card: &mut Card) -> CardId {
let original = card.id; let original = card.id;
while self.target_ids.contains(&card.id) { while self.existing_card_ids.contains(&card.id) {
card.id.0 += 999; card.id.0 += 999;
} }
original original