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

Ensure non-empty names

Browse Source 
https://github.com/ankitects/anki/pull/801/
This commit is contained in:
abdo 2020-10-22 16:11:06 +03:00
parent 6d68bfa594
commit 97ea14449f
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rslib/src/notetype/mod.rs
View File

@ -227,9 +227,12 @@ impl NoteType {
if self.name.contains(bad_chars) {
self.name = self.name.replace(bad_chars, "");
}
if self.name.is_empty() {
return Err(AnkiError::invalid_input("Empty note type name"));
}
self.normalize_names();
self.fix_field_names();
self.fix_template_names();
self.fix_field_names()?;
self.fix_template_names()?;
self.ensure_names_unique();
self.reposition_sort_idx();
@ -323,12 +326,26 @@ impl NoteType {
DeckID(self.config.target_deck_id)
}
fn fix_field_names(&mut self) {
self.fields.iter_mut().for_each(NoteField::fix_name);
fn fix_field_names(&mut self) -> Result<()> {
for mut f in &mut self.fields {
NoteField::fix_name(&mut f);
if f.name.is_empty() {
return Err(AnkiError::invalid_input("Empty field name"));
}
}
Ok(())
}
fn fix_template_names(&mut self) {
self.templates.iter_mut().for_each(CardTemplate::fix_name);
fn fix_template_names(&mut self) -> Result<()> {
for mut t in &mut self.templates {
CardTemplate::fix_name(&mut t);
if t.name.is_empty() {
return Err(AnkiError::invalid_input("Empty template name"));
}
}
Ok(())
}
/// Find the field index of the provided field name.