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

strip unwanted control characters when writing fields

Browse source 
closes #661
This commit is contained in:
Damien Elmes 2020-07-24 09:18:05 +10:00
parent a3d8bd1a45
commit 6af5cb9f38
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rslib/src/notes.rs
View file

@ -24,8 +24,6 @@ use std::{
define_newtype!(NoteID, i64); define_newtype!(NoteID, i64);
// fixme: ensure nulls and x1f not in field contents
#[derive(Default)] #[derive(Default)]
pub(crate) struct TransformNoteOutput { pub(crate) struct TransformNoteOutput {
pub changed: bool, pub changed: bool,
@ -88,6 +86,12 @@ impl Note {
))); )));
} }
for field in &mut self.fields {
if field.contains(invalid_char_for_field) {
*field = field.replace(invalid_char_for_field, "");
}
}
if normalize_text { if normalize_text {
for field in &mut self.fields { for field in &mut self.fields {
ensure_string_in_nfc(field); ensure_string_in_nfc(field);
@ -226,6 +230,10 @@ fn anki_base91(mut n: u64) -> String {
buf.chars().rev().collect() buf.chars().rev().collect()
} }
fn invalid_char_for_field(c: char) -> bool {
c.is_ascii_control() && c != '\n' && c != '\t'
}
impl Collection { impl Collection {
fn canonify_note_tags(&self, note: &mut Note, usn: Usn) -> Result<()> { fn canonify_note_tags(&self, note: &mut Note, usn: Usn) -> Result<()> {
if !note.tags.is_empty() { if !note.tags.is_empty() {