hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-22 13:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore empty/whitespace-only model.json files

Browse source
This commit is contained in:
Mixu78 2021-04-24 23:31:32 +03:00
parent 532d170585
commit eba105701b
No known key found for this signature in database
GPG key ID: EC2FBE9F510DBE3D
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/snapshot_middleware/json_model.rs
View file

@ -18,6 +18,17 @@ pub fn snapshot_json_model(
instance_name: &str, instance_name: &str,
) -> SnapshotInstanceResult { ) -> SnapshotInstanceResult {
let contents = vfs.read(path)?; 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) let instance: JsonModel = serde_json::from_slice(&contents)
.with_context(|| format!("File is not a valid JSON model: {}", path.display()))?; .with_context(|| format!("File is not a valid JSON model: {}", path.display()))?;