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

Tidy up path metadata, entry API, begin implementing

Browse source
This commit is contained in:
Lucien Greathouse 2019-01-17 10:34:37 -08:00
parent 1d412cf0d5
commit dcac9773fb
4 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
server/src/path_map.rs
View file

@ -130,3 +130,14 @@ impl<'a, T> Entry<'a, T> {
}).value }).value
} }
} }
impl<'a, T> Entry<'a, T>
where T: Default
{
pub fn or_default(self) -> &'a mut T {
&mut self.internal.or_insert(PathMapNode {
value: Default::default(),
children: HashSet::new(),
}).value
}
}

7
server/src/rbx_session.rs
View file

@ -23,9 +23,9 @@ const INIT_SCRIPT: &str = "init.lua";
const INIT_SERVER_SCRIPT: &str = "init.server.lua"; const INIT_SERVER_SCRIPT: &str = "init.server.lua";
const INIT_CLIENT_SCRIPT: &str = "init.client.lua"; const INIT_CLIENT_SCRIPT: &str = "init.client.lua";
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Default, Serialize, Deserialize)]
pub struct MetadataPerPath { pub struct MetadataPerPath {
pub instance_id: RbxId, pub instance_id: Option<RbxId>,
pub instance_name: Option<String>, pub instance_name: Option<String>,
} }
@ -91,7 +91,8 @@ impl RbxSession {
trace!("Snapshotting path {}", path_to_snapshot.display()); trace!("Snapshotting path {}", path_to_snapshot.display());
let path_metadata = self.metadata_per_path.get(&path_to_snapshot).unwrap(); let path_metadata = self.metadata_per_path.get(&path_to_snapshot).unwrap();
let instance_id = path_metadata.instance_id; let instance_id = path_metadata.instance_id
.expect("Instance did not exist in tree");
// If this instance is a sync point, pull its name out of our // If this instance is a sync point, pull its name out of our
// per-path metadata store. // per-path metadata store.

9
server/src/rbx_snapshot.rs
View file

@ -8,7 +8,7 @@ use std::{
use serde_derive::{Serialize, Deserialize}; use serde_derive::{Serialize, Deserialize};
use maplit::hashmap; use maplit::hashmap;
use rbx_tree::{RbxId, RbxTree, RbxValue, RbxInstanceProperties}; use rbx_tree::{RbxTree, RbxValue, RbxInstanceProperties};
use failure::Fail; use failure::Fail;
use crate::{ use crate::{
@ -141,11 +141,8 @@ fn snapshot_sync_point_node<'source>(
}; };
// Otherwise, we can log the name of the sync point we just snapshotted. // Otherwise, we can log the name of the sync point we just snapshotted.
// TODO: Use entry API let path_meta = metadata.metadata_per_path.entry(node.path.to_owned()).or_default();
metadata.metadata_per_path.insert(node.path.to_owned(), MetadataPerPath { path_meta.instance_name = Some(snapshot.name.clone().into_owned());
instance_id: RbxId::new(),
instance_name: Some(snapshot.name.clone().into_owned()),
});
Ok(Some(snapshot)) Ok(Some(snapshot))
} }

6
server/src/snapshot_reconciler.rs
View file

@ -99,7 +99,7 @@ pub fn reify_root(
// TODO: Use entry API instead? // TODO: Use entry API instead?
// metadata_per_path.entry() // metadata_per_path.entry()
metadata_per_path.insert(source_path.clone(), MetadataPerPath { metadata_per_path.insert(source_path.clone(), MetadataPerPath {
instance_id: root_id, instance_id: Some(root_id),
instance_name: None, instance_name: None,
}); });
} }
@ -129,8 +129,8 @@ pub fn reify_subtree(
let id = tree.insert_instance(instance, parent_id); let id = tree.insert_instance(instance, parent_id);
if let Some(source_path) = &snapshot.source_path { if let Some(source_path) = &snapshot.source_path {
// TODO: use entry API // TODO: Entry API
// metadata_per_path.insert(source_path.clone(), id); // let metadata = metadata_per_path.entry(source_path.clone(), id);
} }
if let Some(metadata) = &snapshot.metadata { if let Some(metadata) = &snapshot.metadata {