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

Fix setting tags column to first unmapped column (#3568)

Browse source 
Closes #3561.
This commit is contained in:
RumovZ 2024-11-17 15:39:13 +01:00 committed by GitHub
parent 03c50c8332
commit b933796a51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
rslib/src/import_export/text/csv/metadata.rs
View file

@ -497,9 +497,9 @@ fn maybe_set_tags_column(metadata: &mut CsvMetadata, meta_columns: &HashSet<usiz
if metadata.tags_column == 0 { if metadata.tags_column == 0 {
if let Some(CsvNotetype::GlobalNotetype(ref global)) = metadata.notetype { if let Some(CsvNotetype::GlobalNotetype(ref global)) = metadata.notetype {
let max_field = global.field_columns.iter().max().copied().unwrap_or(0); let max_field = global.field_columns.iter().max().copied().unwrap_or(0);
for idx in (max_field + 1) as usize..metadata.column_labels.len() { for idx in (max_field + 1) as usize..=metadata.column_labels.len() {
if !meta_columns.contains(&idx) { if !meta_columns.contains(&idx) {
metadata.tags_column = max_field + 1; metadata.tags_column = idx as u32;
break; break;
} }
} }
@ -843,4 +843,23 @@ pub(in crate::import_export) mod test {
); );
assert_eq!(metadata!(col, "\u{feff}tags:foo\n").global_tags, ["foo"]); assert_eq!(metadata!(col, "\u{feff}tags:foo\n").global_tags, ["foo"]);
} }
#[test]
fn should_not_set_tags_column_if_all_are_field_columns() {
let meta_columns = Default::default();
let mut metadata = CsvMetadata::defaults_for_testing();
maybe_set_tags_column(&mut metadata, &meta_columns);
assert_eq!(metadata.tags_column, 0);
}
#[test]
fn should_set_tags_column_to_next_unused_column() {
let mut meta_columns = HashSet::default();
meta_columns.insert(3);
let mut metadata = CsvMetadata::defaults_for_testing();
metadata.column_labels.push(String::new());
metadata.column_labels.push(String::new());
maybe_set_tags_column(&mut metadata, &meta_columns);
assert_eq!(metadata.tags_column, 4);
}
} }