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

report invalid type/queue

Browse source
This commit is contained in:
Damien Elmes 2020-03-26 19:32:35 +10:00
parent 13c7c82ae3
commit 7a56d18539
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -637,7 +637,7 @@ impl Backend {
} }
fn update_card(&self, pbcard: pb::Card) -> Result<()> { fn update_card(&self, pbcard: pb::Card) -> Result<()> {
let card = pbcard_to_native(pbcard); let card = pbcard_to_native(pbcard)?;
self.with_col(|col| col.with_ctx(|ctx| ctx.storage.update_card(&card))) self.with_col(|col| col.with_ctx(|ctx| ctx.storage.update_card(&card)))
} }
} }
@ -756,16 +756,20 @@ fn card_to_pb(c: Card) -> pb::Card {
} }
} }
fn pbcard_to_native(c: pb::Card) -> Card { fn pbcard_to_native(c: pb::Card) -> Result<Card> {
Card { let ctype = CardType::try_from(c.ctype as u8)
.map_err(|_| AnkiError::invalid_input("invalid card type"))?;
let queue = CardQueue::try_from(c.queue as i8)
.map_err(|_| AnkiError::invalid_input("invalid card queue"))?;
Ok(Card {
id: CardID(c.id), id: CardID(c.id),
nid: NoteID(c.nid), nid: NoteID(c.nid),
did: DeckID(c.did), did: DeckID(c.did),
ord: c.ord as u16, ord: c.ord as u16,
mtime: TimestampSecs(c.mtime), mtime: TimestampSecs(c.mtime),
usn: Usn(c.usn), usn: Usn(c.usn),
ctype: CardType::try_from(c.ctype as u8).unwrap_or(CardType::New), ctype,
queue: CardQueue::try_from(c.queue as i8).unwrap_or(CardQueue::New), queue,
due: c.due, due: c.due,
ivl: c.ivl, ivl: c.ivl,
factor: c.factor as u16, factor: c.factor as u16,
@ -776,5 +780,5 @@ fn pbcard_to_native(c: pb::Card) -> Card {
odid: DeckID(c.odid), odid: DeckID(c.odid),
flags: c.flags, flags: c.flags,
data: c.data, data: c.data,
} })
} }