From 4917cabeb9f30e44aa3371f7f8641d80deae0904 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 1 Jun 2020 19:38:41 +1000 Subject: [PATCH] handle missing counts in sanity check --- rslib/src/sync/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rslib/src/sync/mod.rs b/rslib/src/sync/mod.rs index d649716f3..afb90dc4d 100644 --- a/rslib/src/sync/mod.rs +++ b/rslib/src/sync/mod.rs @@ -11,6 +11,7 @@ use crate::{ notes::{guid, Note}, notetype::{NoteType, NoteTypeSchema11}, prelude::*, + serde::default_on_invalid, tags::{join_tags, split_tags}, version::sync_client_version, }; @@ -171,9 +172,9 @@ pub struct CardEntry { #[derive(Serialize, Deserialize, Debug)] pub struct SanityCheckOut { status: SanityCheckStatus, - #[serde(rename = "c")] + #[serde(rename = "c", default, deserialize_with = "default_on_invalid")] client: Option, - #[serde(rename = "s")] + #[serde(rename = "s", default, deserialize_with = "default_on_invalid")] server: Option, }