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

embed enum to avoid conflicts

Browse source
This commit is contained in:
Damien Elmes 2020-04-17 14:54:26 +10:00
parent f75fd5335d
commit 527c8bf867
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
proto/backend.proto
View file

@ -520,13 +520,12 @@ message CardTemplate {
CardTemplateConfig config = 5; CardTemplateConfig config = 5;
} }
enum NoteTypeKind {
NORMAL = 0;
CLOZE = 1;
}
message NoteTypeConfig { message NoteTypeConfig {
NoteTypeKind kind = 1; enum Kind {
NORMAL = 0;
CLOZE = 1;
}
Kind kind = 1;
uint32 sort_field_idx = 2; uint32 sort_field_idx = 2;
string css = 3; string css = 3;
// fixme: anki currently sets this without flushing // fixme: anki currently sets this without flushing
@ -539,13 +538,13 @@ message NoteTypeConfig {
} }
message CardRequirement { message CardRequirement {
enum CardRequirementKind { enum Kind {
None = 0; None = 0;
Any = 1; Any = 1;
All = 2; All = 2;
} }
uint32 card_ord = 1; uint32 card_ord = 1;
CardRequirementKind kind = 2; Kind kind = 2;
repeated uint32 field_ords = 3; repeated uint32 field_ords = 3;
} }

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

@ -9,8 +9,9 @@ mod stock;
mod templates; mod templates;
pub use crate::backend_proto::{ pub use crate::backend_proto::{
card_requirement::CardRequirementKind, CardRequirement, CardTemplateConfig, NoteFieldConfig, card_requirement::Kind as CardRequirementKind, note_type_config::Kind as NoteTypeKind,
NoteType as NoteTypeProto, NoteTypeConfig, NoteTypeKind, CardRequirement, CardTemplateConfig, NoteFieldConfig, NoteType as NoteTypeProto,
NoteTypeConfig,
}; };
pub(crate) use cardgeninfo::CardGenContext; pub(crate) use cardgeninfo::CardGenContext;
pub use fields::NoteField; pub use fields::NoteField;