From eba105701be589d9e9a708ed640284e52d89af1b Mon Sep 17 00:00:00 2001 From: Mixu78 Date: Sat, 24 Apr 2021 23:31:32 +0300 Subject: [PATCH] Ignore empty/whitespace-only model.json files --- src/snapshot_middleware/json_model.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs index b14b66b4..552be547 100644 --- a/src/snapshot_middleware/json_model.rs +++ b/src/snapshot_middleware/json_model.rs @@ -18,6 +18,17 @@ pub fn snapshot_json_model( instance_name: &str, ) -> SnapshotInstanceResult { let contents = vfs.read(path)?; + if contents.is_empty() { + return Ok(None); + } + + if match String::from_utf8((*contents).to_owned()) { + Ok(v) => v.is_empty() || v.trim().is_empty(), + _ => false, + } { + return Ok(None); + } + let instance: JsonModel = serde_json::from_slice(&contents) .with_context(|| format!("File is not a valid JSON model: {}", path.display()))?;