rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-24 06:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Server component of config maps

Browse Source
This commit is contained in:
Lucien Greathouse
2018-12-30 22:43:23 -08:00
parent 01dd603bd5
commit 4453211c0d
4 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/src/rbx_snapshot.rs
View File

@@ -7,7 +7,10 @@ use std::{
use rbx_tree::{RbxTree, RbxId, RbxInstance, RbxValue};
use crate::path_map::PathMap;
use crate::{
path_map::PathMap,
project::InstanceProjectNodeConfig,
};
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
pub struct InstanceChanges {
@@ -28,11 +31,13 @@ pub struct RbxSnapshotInstance<'a> {
pub properties: HashMap<String, RbxValue>,
pub children: Vec<RbxSnapshotInstance<'a>>,
pub source_path: Option<PathBuf>,
pub config: Option<InstanceProjectNodeConfig>,
}
pub fn reify_root(
snapshot: &RbxSnapshotInstance,
path_map: &mut PathMap<RbxId>,
config_map: &mut HashMap<RbxId, InstanceProjectNodeConfig>,
changes: &mut InstanceChanges,
) -> RbxTree {
let instance = reify_core(snapshot);
@@ -43,10 +48,14 @@ pub fn reify_root(
path_map.insert(source_path.clone(), root_id);
}
if let Some(config) = &snapshot.config {
config_map.insert(root_id, config.clone());
}
changes.added.insert(root_id);
for child in &snapshot.children {
reify_subtree(child, &mut tree, root_id, path_map, changes);
reify_subtree(child, &mut tree, root_id, path_map, config_map, changes);
}
tree
@@ -57,6 +66,7 @@ pub fn reify_subtree(
tree: &mut RbxTree,
parent_id: RbxId,
path_map: &mut PathMap<RbxId>,
config_map: &mut HashMap<RbxId, InstanceProjectNodeConfig>,
changes: &mut InstanceChanges,
) {
let instance = reify_core(snapshot);
@@ -66,10 +76,14 @@ pub fn reify_subtree(
path_map.insert(source_path.clone(), id);
}
if let Some(config) = &snapshot.config {
config_map.insert(id, config.clone());
}
changes.added.insert(id);
for child in &snapshot.children {
reify_subtree(child, tree, id, path_map, changes);
reify_subtree(child, tree, id, path_map, config_map, changes);
}
}
@@ -78,13 +92,14 @@ pub fn reconcile_subtree(
id: RbxId,
snapshot: &RbxSnapshotInstance,
path_map: &mut PathMap<RbxId>,
config_map: &mut HashMap<RbxId, InstanceProjectNodeConfig>,
changes: &mut InstanceChanges,
) {
if reconcile_instance_properties(tree.get_instance_mut(id).unwrap(), snapshot) {
changes.updated.insert(id);
}
reconcile_instance_children(tree, id, snapshot, path_map, changes);
reconcile_instance_children(tree, id, snapshot, path_map, config_map, changes);
}
fn reify_core(snapshot: &RbxSnapshotInstance) -> RbxInstance {
@@ -165,6 +180,7 @@ fn reconcile_instance_children(
id: RbxId,
snapshot: &RbxSnapshotInstance,
path_map: &mut PathMap<RbxId>,
config_map: &mut HashMap<RbxId, InstanceProjectNodeConfig>,
changes: &mut InstanceChanges,
) {
let children_ids = tree.get_instance(id).unwrap().get_children_ids().to_vec();
@@ -195,18 +211,19 @@ fn reconcile_instance_children(
}
for child_snapshot in &children_to_add {
reify_subtree(child_snapshot, tree, id, path_map, changes);
reify_subtree(child_snapshot, tree, id, path_map, config_map, changes);
}
for child_id in &children_to_remove {
if let Some(subtree) = tree.remove_instance(*child_id) {
for id in subtree.iter_all_ids() {
config_map.remove(&id);
changes.removed.insert(id);
}
}
}
for (child_id, child_snapshot) in &children_to_update {
reconcile_subtree(tree, *child_id, child_snapshot, path_map, changes);
reconcile_subtree(tree, *child_id, child_snapshot, path_map, config_map, changes);
}
}