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

clearer message when template error is preventing save

Browse source
This commit is contained in:
Damien Elmes 2020-07-29 12:42:09 +10:00
parent b6687f0203
commit 7e7f2d0be4
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/aqt/clayout.py
View file

@ -747,7 +747,7 @@ Enter deck to place new %s cards in, or leave blank:"""
try: try:
fut.result() fut.result()
except TemplateError as e: except TemplateError as e:
showWarning("Unable to save changes: " + str(e)) showWarning(str(e))
return return
self.mw.reset() self.mw.reset()
tooltip("Changes saved.", parent=self.parent()) tooltip("Changes saved.", parent=self.parent())

3
rslib/ftl/card-templates.ftl
View file

@ -13,3 +13,6 @@ card-templates-preview-box = Preview
card-templates-template-box = Template card-templates-template-box = Template
card-templates-sample-cloze = This is a {"{{c1::"}sample{"}}"} cloze deletion. card-templates-sample-cloze = This is a {"{{c1::"}sample{"}}"} cloze deletion.
card-templates-fill-empty = Fill Empty Fields card-templates-fill-empty = Fill Empty Fields
card-templates-invalid-template-number = Please correct the problems on card template { $number } first.

1
rslib/src/backend/mod.rs
View file

@ -146,6 +146,7 @@ fn anki_error_to_proto_error(err: AnkiError, i18n: &I18n) -> pb::BackendError {
AnkiError::Existing => V::Exists(Empty {}), AnkiError::Existing => V::Exists(Empty {}),
AnkiError::DeckIsFiltered => V::DeckIsFiltered(Empty {}), AnkiError::DeckIsFiltered => V::DeckIsFiltered(Empty {}),
AnkiError::SearchError(_) => V::InvalidInput(pb::Empty {}), AnkiError::SearchError(_) => V::InvalidInput(pb::Empty {}),
AnkiError::TemplateSaveError { .. } => V::TemplateParse(pb::Empty {}),
}; };
pb::BackendError { pb::BackendError {

9
rslib/src/err.rs
View file

@ -1,7 +1,7 @@
// Copyright: Ankitects Pty Ltd and contributors // Copyright: Ankitects Pty Ltd and contributors
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
use crate::i18n::{tr_strs, I18n, TR}; use crate::i18n::{tr_args, tr_strs, I18n, TR};
pub use failure::{Error, Fail}; pub use failure::{Error, Fail};
use reqwest::StatusCode; use reqwest::StatusCode;
use std::io; use std::io;
@ -16,6 +16,9 @@ pub enum AnkiError {
#[fail(display = "invalid card template: {}", info)] #[fail(display = "invalid card template: {}", info)]
TemplateError { info: String }, TemplateError { info: String },
#[fail(display = "unable to save template {}", ordinal)]
TemplateSaveError { ordinal: usize },
#[fail(display = "I/O error: {}", info)] #[fail(display = "I/O error: {}", info)]
IOError { info: String }, IOError { info: String },
@ -107,6 +110,10 @@ impl AnkiError {
// already localized // already localized
info.into() info.into()
} }
AnkiError::TemplateSaveError { ordinal } => i18n.trn(
TR::CardTemplatesInvalidTemplateNumber,
tr_args!["number"=>ordinal+1],
),
AnkiError::DBError { info, kind } => match kind { AnkiError::DBError { info, kind } => match kind {
DBErrorKind::Corrupt => info.clone(), DBErrorKind::Corrupt => info.clone(),
DBErrorKind::Locked => "Anki already open, or media currently syncing.".into(), DBErrorKind::Locked => "Anki already open, or media currently syncing.".into(),

4
rslib/src/notetype/mod.rs
View file

@ -229,9 +229,7 @@ impl NoteType {
} }
}); });
if let Some(idx) = invalid_card_idx { if let Some(idx) = invalid_card_idx {
return Err(AnkiError::TemplateError { return Err(AnkiError::TemplateSaveError { ordinal: idx });
info: format!("invalid card {}", idx + 1),
});
} }
let reqs = self.updated_requirements(&parsed_templates); let reqs = self.updated_requirements(&parsed_templates);