langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trim extra colons on conversion to NativeDeckName (#2748)

Browse Source 
This fixes issue #2692. Leading/trailing colons are remove along with whitespace so " : : :foo:bar: : : " becomes "foo:bar"
This commit is contained in:
Sam Waechter 2023-10-18 23:42:57 -04:00 committed by GitHub
parent d7a0bc0d42
commit 0e24532439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rslib/src/decks/name.rs
View File

@ -196,7 +196,7 @@ fn normalized_deck_name_component(comp: &str) -> Cow<str> {
if out.contains(invalid_char_for_deck_component) { if out.contains(invalid_char_for_deck_component) {
out = out.replace(invalid_char_for_deck_component, "").into(); out = out.replace(invalid_char_for_deck_component, "").into();
} }
let trimmed = out.trim(); let trimmed = out.trim_matches(|c: char| c.is_whitespace() || c == ':');
if trimmed.is_empty() { if trimmed.is_empty() {
"blank".to_string().into() "blank".to_string().into()
} else if trimmed.len() != out.len() { } else if trimmed.len() != out.len() {
@ -236,6 +236,8 @@ mod test {
// implicitly normalize // implicitly normalize
assert_eq!(native_name("fo\x1fo::ba\nr"), "foo\x1fbar"); assert_eq!(native_name("fo\x1fo::ba\nr"), "foo\x1fbar");
assert_eq!(native_name("fo\u{a}o\x1fbar"), "foobar"); assert_eq!(native_name("fo\u{a}o\x1fbar"), "foobar");
assert_eq!(native_name("foo:::bar"), "foo\x1fbar");
assert_eq!(native_name("foo:::bar:baz: "), "foo\x1fbar:baz");
} }
#[test] #[test]