ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Refactor .meta.json into AdjacentMetadata type more strongly

Browse Source
This commit is contained in:
Lucien Greathouse
2019-10-08 15:42:44 -07:00
parent 13cb0a27a0
commit 8a9a72fd50
2 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/snapshot_middleware/lua.rs
View File

@@ -94,31 +94,28 @@ fn snapshot_lua_file<F: ImfsFetcher>(
.path()
.with_file_name(format!("{}.meta.json", instance_name));
let mut metadata = InstanceMetadata {
let metadata = InstanceMetadata {
instigating_source: Some(entry.path().to_path_buf().into()),
relevant_paths: vec![entry.path().to_path_buf(), meta_path.clone()],
..Default::default()
};
if let Some(meta_entry) = imfs.get(meta_path).with_not_found()? {
let meta_contents = meta_entry.contents(imfs)?;
let parsed: AdjacentMetadata = serde_json::from_slice(meta_contents)
// TODO: Turn into error type
.expect(".meta.json file was malformed");
if let Some(ignore) = parsed.ignore_unknown_instances {
metadata.ignore_unknown_instances = ignore;
}
}
Ok(Some(InstanceSnapshot {
let mut snapshot = InstanceSnapshot {
snapshot_id: None,
metadata,
name: Cow::Owned(instance_name.to_owned()),
class_name: Cow::Borrowed(class_name),
properties,
children: Vec::new(),
}))
};
if let Some(meta_entry) = imfs.get(meta_path).with_not_found()? {
let meta_contents = meta_entry.contents(imfs)?;
let mut metadata = AdjacentMetadata::from_slice(meta_contents);
metadata.apply_all(&mut snapshot);
}
Ok(Some(snapshot))
}
/// Attempts to snapshot an 'init' Lua script contained inside of a folder with