Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

init.meta.json support #183

Merged
merged 8 commits into from
Jun 6, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 38 additions & 3 deletions server/src/rbx_snapshot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ use crate::{
const INIT_MODULE_NAME: &str = "init.lua";
const INIT_SERVER_NAME: &str = "init.server.lua";
const INIT_CLIENT_NAME: &str = "init.client.lua";
const INIT_META_NAME: &str = "init.meta.json";

pub struct SnapshotContext {
pub plugin_context: Option<SnapshotPluginContext>,
Expand Down Expand Up @@ -105,6 +106,12 @@ pub enum SnapshotError {
path: PathBuf,
},

InitMetaError {
#[fail(cause)]
inner: serde_json::Error,
path: PathBuf,
},

XmlModelDecodeError {
#[fail(cause)]
inner: rbx_xml::DecodeError,
Expand Down Expand Up @@ -152,6 +159,9 @@ impl fmt::Display for SnapshotError {
SnapshotError::JsonModelDecodeError { inner, path } => {
write!(output, "Malformed .model.json model: {} in path {}", inner, path.display())
},
SnapshotError::InitMetaError { inner, path } => {
write!(output, "Malformed init.meta.json: {} in path {}", inner, path.display())
},
SnapshotError::XmlModelDecodeError { inner, path } => {
write!(output, "Malformed rbxmx model: {} in path {}", inner, path.display())
},
Expand Down Expand Up @@ -299,6 +309,17 @@ fn snapshot_imfs_directory<'source>(
let init_path = directory.path.join(INIT_MODULE_NAME);
let init_server_path = directory.path.join(INIT_SERVER_NAME);
let init_client_path = directory.path.join(INIT_CLIENT_NAME);
let init_meta_path = directory.path.join(INIT_META_NAME);

let meta: InitMetaJson = if let Some(ImfsItem::File(file)) = imfs.get(&init_meta_path) {
serde_json::from_slice(&file.contents)
.map_err(|inner| SnapshotError::InitMetaError {
inner,
path: file.path.to_path_buf(),
})?
} else {
InitMetaJson::default()
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can fold this code down even further!

Instead of assigning the struct out here and defaulting to InitMetaJson, can we check for the existence of this file later, and then pull properties directly from it onto the snapshot?

Then we can localize the changes to this function to exactly one region, and limit the impact in cases that don't use an init.meta.json file.


let snapshot_name = instance_name
.unwrap_or_else(|| {
Expand All @@ -315,13 +336,13 @@ fn snapshot_imfs_directory<'source>(
snapshot_imfs_path(context, imfs, &init_client_path, Some(snapshot_name))?.unwrap()
} else {
RbxSnapshotInstance {
class_name: Cow::Borrowed("Folder"),
class_name: Cow::Owned(meta.class_name.unwrap_or_else(|| "Folder".to_owned())),
name: snapshot_name,
properties: HashMap::new(),
properties: meta.properties,
children: Vec::new(),
metadata: MetadataPerInstance {
source_path: None,
ignore_unknown_instances: false,
ignore_unknown_instances: meta.ignore_unknown_children.unwrap_or(false),
project_definition: None,
},
}
LPGhatguy marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -351,6 +372,20 @@ fn snapshot_imfs_directory<'source>(
Ok(Some(snapshot))
}

#[derive(Debug, Default, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
struct InitMetaJson {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need the Json part of this struct name.

Since we don't serialize the struct, we might be able to drop the Serialize derive and all of the skip_serializing_if attributes as well.

#[serde(skip_serializing_if = "Option::is_none")]
class_name: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
ignore_unknown_children: Option<bool>,
#[serde(
default = "HashMap::new",
skip_serializing_if = "HashMap::is_empty",
)]
properties: HashMap<String, RbxValue>,
LPGhatguy marked this conversation as resolved.
Show resolved Hide resolved
}

fn snapshot_imfs_file<'source>(
context: &SnapshotContext,
file: &'source ImfsFile,
Expand Down
1 change: 1 addition & 0 deletions server/tests/snapshot_snapshots.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ generate_snapshot_tests!(
empty,
json_model,
localization,
meta_files,
multi_partition_game,
nested_partitions,
single_partition_game,
Expand Down
6 changes: 6 additions & 0 deletions test-projects/meta_files/default.project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "test-model",
"tree": {
"$path": "src"
}
}
37 changes: 37 additions & 0 deletions test-projects/meta_files/expected-snapshot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"name": "test-model",
"class_name": "Tool",
"properties": {
"Enabled": {
"Type": "Bool",
"Value": true
}
},
"children": [
{
"name": "A",
"class_name": "Folder",
"properties": {},
"children": [],
"metadata": {
"ignore_unknown_instances": true,
"source_path": "src/A",
"project_definition": null
}
}
],
"metadata": {
"ignore_unknown_instances": false,
"source_path": "src",
"project_definition": [
"test-model",
{
"class_name": null,
"children": {},
"properties": {},
"ignore_unknown_instances": null,
"path": "src"
}
]
}
}
3 changes: 3 additions & 0 deletions test-projects/meta_files/src/A/init.meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignoreUnknownChildren": true
}
9 changes: 9 additions & 0 deletions test-projects/meta_files/src/init.meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"className": "Tool",
"properties": {
"Enabled": {
"Type": "Bool",
"Value": true
}
}
}