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 all 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
42 changes: 42 additions & 0 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,7 @@ 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 snapshot_name = instance_name
.unwrap_or_else(|| {
Expand Down Expand Up @@ -327,6 +338,27 @@ fn snapshot_imfs_directory<'source>(
}
LPGhatguy marked this conversation as resolved.
Show resolved Hide resolved
};

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

if let Some(meta_class) = meta.class_name {
snapshot.class_name = Cow::Owned(meta_class);
}

if let Some(meta_ignore_instances) = meta.ignore_unknown_instances {
snapshot.metadata.ignore_unknown_instances = meta_ignore_instances;
}

for (key, value) in meta.properties {
let resolved_value = try_resolve_value(&snapshot.class_name, &key, &value)?;
snapshot.properties.insert(key, resolved_value);
}
}

snapshot.metadata.source_path = Some(directory.path.to_owned());

for child_path in &directory.children {
Expand All @@ -351,6 +383,16 @@ fn snapshot_imfs_directory<'source>(
Ok(Some(snapshot))
}

#[derive(Debug, Default, Deserialize)]
#[serde(rename_all = "camelCase")]
struct InitMeta {
class_name: Option<String>,
ignore_unknown_instances: Option<bool>,

#[serde(default = "HashMap::new")]
properties: HashMap<String, UnresolvedRbxValue>,
}

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"
}
}
57 changes: 57 additions & 0 deletions test-projects/meta_files/expected-snapshot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"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
}
},
{
"name": "Script",
"class_name": "Script",
"properties": {
"Disabled": {
"Type": "Bool",
"Value": true
},
"Source": {
"Type": "String",
"Value": "print(\"Hello, world\")"
}
},
"children": [],
"metadata": {
"ignore_unknown_instances": false,
"source_path": "src/Script",
"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 @@
{
"ignoreUnknownInstances": true
}
5 changes: 5 additions & 0 deletions test-projects/meta_files/src/Script/init.meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"properties": {
"Disabled": true
}
}
1 change: 1 addition & 0 deletions test-projects/meta_files/src/Script/init.server.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
print("Hello, world")
6 changes: 6 additions & 0 deletions test-projects/meta_files/src/init.meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"className": "Tool",
"properties": {
"Enabled": true
}
}