GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-13 08:07:11 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix deck names differing in case being duplicated in CSV import (#3008)

Browse source
This commit is contained in:
Abdo 2024-02-14 13:25:54 +03:00 committed by GitHub
parent 23291e7172
commit 2b4cb2992b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rslib/src/import_export/text/import.rs
View file

@ -6,6 +6,8 @@ use std::collections::HashMap;
use std::collections::HashSet; use std::collections::HashSet;
use std::sync::Arc; use std::sync::Arc;
use unicase::UniCase;
use super::NameOrId; use super::NameOrId;
use crate::card::CardQueue; use crate::card::CardQueue;
use crate::card::CardType; use crate::card::CardType;
@ -83,7 +85,7 @@ struct Context<'a> {
struct DeckIdsByNameOrId { struct DeckIdsByNameOrId {
ids: HashSet<DeckId>, ids: HashSet<DeckId>,
names: HashMap<String, DeckId>, names: HashMap<UniCase<String>, DeckId>,
default: Option<DeckId>, default: Option<DeckId>,
} }
@ -146,10 +148,10 @@ impl Duplicate {
impl DeckIdsByNameOrId { impl DeckIdsByNameOrId {
fn new(col: &mut Collection, default: &NameOrId) -> Result<Self> { fn new(col: &mut Collection, default: &NameOrId) -> Result<Self> {
let names: HashMap<String, DeckId> = col let names: HashMap<UniCase<String>, DeckId> = col
.get_all_normal_deck_names(false)? .get_all_normal_deck_names(false)?
.into_iter() .into_iter()
.map(|(id, name)| (name, id)) .map(|(id, name)| (UniCase::new(name), id))
.collect(); .collect();
let ids = names.values().copied().collect(); let ids = names.values().copied().collect();
let mut new = Self { let mut new = Self {
@ -166,13 +168,13 @@ impl DeckIdsByNameOrId {
match name_or_id { match name_or_id {
_ if *name_or_id == NameOrId::default() => self.default, _ if *name_or_id == NameOrId::default() => self.default,
NameOrId::Id(id) => self.ids.get(&DeckId(*id)).copied(), NameOrId::Id(id) => self.ids.get(&DeckId(*id)).copied(),
NameOrId::Name(name) => self.names.get(name).copied(), NameOrId::Name(name) => self.names.get(&UniCase::new(name.to_string())).copied(),
} }
} }
fn insert(&mut self, deck_id: DeckId, name: String) { fn insert(&mut self, deck_id: DeckId, name: String) {
self.ids.insert(deck_id); self.ids.insert(deck_id);
self.names.insert(name, deck_id); self.names.insert(UniCase::new(name), deck_id);
} }
} }