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

Update snapshot error type and handle serde_json errors in JSON models

Browse source
This commit is contained in:
Lucien Greathouse 2020-03-13 20:31:31 -07:00
parent b0fc9ee507
commit 6de74b41b3
2 changed files with 53 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/snapshot_middleware/json_model.rs
View file

@ -8,6 +8,7 @@ use serde::Deserialize;
use crate::snapshot::{InstanceContext, InstanceSnapshot};
use super::{
error::SnapshotError,
middleware::{SnapshotInstanceResult, SnapshotMiddleware},
util::match_file_name,
};
@ -27,8 +28,9 @@ impl SnapshotMiddleware for SnapshotJsonModel {
None => return Ok(None),
};
let instance: JsonModel =
serde_json::from_slice(&vfs.read(path)?).expect("TODO: Handle serde_json errors");
let contents = vfs.read(path)?;
let instance: JsonModel = serde_json::from_slice(&contents)
.map_err(|source| SnapshotError::malformed_model_json(source, path))?;
if let Some(json_name) = &instance.name {
if json_name != instance_name {