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

Thread Cow<'str> through for naming nodes

Browse Source
This commit is contained in:
Lucien Greathouse
2019-01-16 16:36:22 -08:00
parent f254a51d59
commit 3620a9d256
2 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/rbx_session.rs
View File

@@ -1,4 +1,5 @@
use std::{ use std::{
borrow::Cow,
collections::HashMap, collections::HashMap,
path::{Path, PathBuf}, path::{Path, PathBuf},
str, str,
@@ -80,10 +81,12 @@ impl RbxSession {
trace!("Snapshotting path {}", path_to_snapshot.display()); trace!("Snapshotting path {}", path_to_snapshot.display());
let instance_name = self.sync_point_names.get(&path_to_snapshot)
.map(|value| Cow::Owned(value.to_owned()));
let mut snapshot_meta = SnapshotMetadata { let mut snapshot_meta = SnapshotMetadata {
sync_point_names: &mut self.sync_point_names, sync_point_names: &mut self.sync_point_names,
}; };
let maybe_snapshot = snapshot_imfs_path(&imfs, &mut snapshot_meta, &path_to_snapshot) let maybe_snapshot = snapshot_imfs_path(&imfs, &mut snapshot_meta, &path_to_snapshot, instance_name)
.unwrap_or_else(|_| panic!("Could not generate instance snapshot for path {}", path_to_snapshot.display())); .unwrap_or_else(|_| panic!("Could not generate instance snapshot for path {}", path_to_snapshot.display()));
let snapshot = match maybe_snapshot { let snapshot = match maybe_snapshot {

67
server/src/rbx_snapshot.rs
View File

@@ -83,14 +83,14 @@ pub fn snapshot_project_tree<'source>(
metadata: &mut SnapshotMetadata, metadata: &mut SnapshotMetadata,
project: &'source Project, project: &'source Project,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
snapshot_project_node(imfs, metadata, &project.tree, &project.name) snapshot_project_node(imfs, metadata, &project.tree, Cow::Borrowed(&project.name))
} }
fn snapshot_project_node<'source>( fn snapshot_project_node<'source>(
imfs: &'source Imfs, imfs: &'source Imfs,
metadata: &mut SnapshotMetadata, metadata: &mut SnapshotMetadata,
node: &'source ProjectNode, node: &'source ProjectNode,
instance_name: &'source str, instance_name: Cow<'source, str>,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
match node { match node {
ProjectNode::Instance(instance_node) => snapshot_instance_node(imfs, metadata, instance_node, instance_name), ProjectNode::Instance(instance_node) => snapshot_instance_node(imfs, metadata, instance_node, instance_name),
@@ -102,19 +102,19 @@ fn snapshot_instance_node<'source>(
imfs: &'source Imfs, imfs: &'source Imfs,
metadata: &mut SnapshotMetadata, metadata: &mut SnapshotMetadata,
node: &'source InstanceProjectNode, node: &'source InstanceProjectNode,
instance_name: &'source str, instance_name: Cow<'source, str>,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
let mut children = Vec::new(); let mut children = Vec::new();
for (child_name, child_project_node) in &node.children { for (child_name, child_project_node) in &node.children {
if let Some(child) = snapshot_project_node(imfs, metadata, child_project_node, child_name)? { if let Some(child) = snapshot_project_node(imfs, metadata, child_project_node, Cow::Borrowed(child_name))? {
children.push(child); children.push(child);
} }
} }
Ok(Some(RbxSnapshotInstance { Ok(Some(RbxSnapshotInstance {
class_name: Cow::Borrowed(&node.class_name), class_name: Cow::Borrowed(&node.class_name),
name: Cow::Borrowed(instance_name), name: instance_name,
properties: node.properties.clone(), properties: node.properties.clone(),
children, children,
source_path: None, source_path: None,
@@ -126,19 +126,19 @@ fn snapshot_sync_point_node<'source>(
imfs: &'source Imfs, imfs: &'source Imfs,
metadata: &mut SnapshotMetadata, metadata: &mut SnapshotMetadata,
node: &'source SyncPointProjectNode, node: &'source SyncPointProjectNode,
instance_name: &'source str, instance_name: Cow<'source, str>,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
let maybe_snapshot = snapshot_imfs_path(imfs, metadata, &node.path, Some(instance_name))?;
// If the snapshot resulted in no instances, like if it targets an unknown // If the snapshot resulted in no instances, like if it targets an unknown
// file or an empty model file, we can early-return. // file or an empty model file, we can early-return.
let mut snapshot = match snapshot_imfs_path(imfs, metadata, &node.path)? { let snapshot = match maybe_snapshot {
Some(snapshot) => snapshot, Some(snapshot) => snapshot,
None => return Ok(None), None => return Ok(None),
}; };
// Otherwise, we can mutate the snapshot we got back and track some extra // Otherwise, we can log the name of the sync point we just snapshotted.
// metadata. metadata.sync_point_names.insert(node.path.to_owned(), snapshot.name.clone().into_owned());
snapshot.name = Cow::Borrowed(instance_name);
metadata.sync_point_names.insert(node.path.to_owned(), instance_name.to_owned());
Ok(Some(snapshot)) Ok(Some(snapshot))
} }
@@ -146,12 +146,13 @@ fn snapshot_sync_point_node<'source>(
pub fn snapshot_imfs_path<'source>( pub fn snapshot_imfs_path<'source>(
imfs: &'source Imfs, imfs: &'source Imfs,
metadata: &mut SnapshotMetadata, metadata: &mut SnapshotMetadata,
path: &Path path: &Path,
instance_name: Option<Cow<'source, str>>,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
// If the given path doesn't exist in the in-memory filesystem, we consider // If the given path doesn't exist in the in-memory filesystem, we consider
// that an error. // that an error.
match imfs.get(path) { match imfs.get(path) {
Some(imfs_item) => snapshot_imfs_item(imfs, metadata, imfs_item), Some(imfs_item) => snapshot_imfs_item(imfs, metadata, imfs_item, instance_name),
None => return Err(SnapshotError::DidNotExist(path.to_owned())), None => return Err(SnapshotError::DidNotExist(path.to_owned())),
} }
} }
@@ -160,10 +161,11 @@ fn snapshot_imfs_item<'source>(
imfs: &'source Imfs, imfs: &'source Imfs,
metadata: &mut SnapshotMetadata, metadata: &mut SnapshotMetadata,
item: &'source ImfsItem, item: &'source ImfsItem,
instance_name: Option<Cow<'source, str>>,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
match item { match item {
ImfsItem::File(file) => snapshot_imfs_file(metadata, file), ImfsItem::File(file) => snapshot_imfs_file(file, instance_name),
ImfsItem::Directory(directory) => snapshot_imfs_directory(imfs, metadata, directory), ImfsItem::Directory(directory) => snapshot_imfs_directory(imfs, metadata, directory, instance_name),
} }
} }
@@ -171,39 +173,36 @@ fn snapshot_imfs_directory<'source>(
imfs: &'source Imfs, imfs: &'source Imfs,
metadata: &mut SnapshotMetadata, metadata: &mut SnapshotMetadata,
directory: &'source ImfsDirectory, directory: &'source ImfsDirectory,
instance_name: Option<Cow<'source, str>>,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
let init_path = directory.path.join(INIT_MODULE_NAME); let init_path = directory.path.join(INIT_MODULE_NAME);
let init_server_path = directory.path.join(INIT_SERVER_NAME); let init_server_path = directory.path.join(INIT_SERVER_NAME);
let init_client_path = directory.path.join(INIT_CLIENT_NAME); let init_client_path = directory.path.join(INIT_CLIENT_NAME);
let snapshot_name = instance_name
.unwrap_or_else(|| {
Cow::Borrowed(directory.path
.file_name().expect("Could not extract file name")
.to_str().expect("Could not convert path to UTF-8"))
});
let mut snapshot = if directory.children.contains(&init_path) { let mut snapshot = if directory.children.contains(&init_path) {
snapshot_imfs_path(imfs, metadata, &init_path)?.unwrap() snapshot_imfs_path(imfs, metadata, &init_path, Some(snapshot_name.clone()))?.unwrap()
} else if directory.children.contains(&init_server_path) { } else if directory.children.contains(&init_server_path) {
snapshot_imfs_path(imfs, metadata, &init_server_path)?.unwrap() snapshot_imfs_path(imfs, metadata, &init_server_path, Some(snapshot_name.clone()))?.unwrap()
} else if directory.children.contains(&init_client_path) { } else if directory.children.contains(&init_client_path) {
snapshot_imfs_path(imfs, metadata, &init_client_path)?.unwrap() snapshot_imfs_path(imfs, metadata, &init_client_path, Some(snapshot_name.clone()))?.unwrap()
} else { } else {
RbxSnapshotInstance { RbxSnapshotInstance {
class_name: Cow::Borrowed("Folder"), class_name: Cow::Borrowed("Folder"),
name: Cow::Borrowed(""), name: Cow::Borrowed(""),
properties: HashMap::new(), properties: HashMap::new(),
children: Vec::new(), children: Vec::new(),
source_path: Some(directory.path.clone()), source_path: Some(directory.path.to_owned()),
metadata: None, metadata: None,
} }
}; };
// We have to be careful not to lose instance names that are specified in
// the project manifest. We store them in sync_point_names when the original
// tree is constructed.
snapshot.name = if let Some(actual_name) = metadata.sync_point_names.get(&directory.path) {
Cow::Owned(actual_name.clone())
} else {
Cow::Borrowed(directory.path
.file_name().expect("Could not extract file name")
.to_str().expect("Could not convert path to UTF-8"))
};
for child_path in &directory.children { for child_path in &directory.children {
let child_name = child_path let child_name = child_path
.file_name().expect("Couldn't extract file name") .file_name().expect("Couldn't extract file name")
@@ -216,7 +215,7 @@ fn snapshot_imfs_directory<'source>(
// them here. // them here.
}, },
_ => { _ => {
if let Some(child) = snapshot_imfs_path(imfs, metadata, child_path)? { if let Some(child) = snapshot_imfs_path(imfs, metadata, child_path, None)? {
snapshot.children.push(child); snapshot.children.push(child);
} }
}, },
@@ -227,8 +226,8 @@ fn snapshot_imfs_directory<'source>(
} }
fn snapshot_imfs_file<'source>( fn snapshot_imfs_file<'source>(
metadata: &mut SnapshotMetadata,
file: &'source ImfsFile, file: &'source ImfsFile,
instance_name: Option<Cow<'source, str>>,
) -> SnapshotResult<'source> { ) -> SnapshotResult<'source> {
let extension = file.path.extension() let extension = file.path.extension()
.map(|v| v.to_str().expect("Could not convert extension to UTF-8")); .map(|v| v.to_str().expect("Could not convert extension to UTF-8"));
@@ -244,8 +243,8 @@ fn snapshot_imfs_file<'source>(
if let Some(snapshot) = maybe_snapshot.as_mut() { if let Some(snapshot) = maybe_snapshot.as_mut() {
// Carefully preserve name from project manifest if present. // Carefully preserve name from project manifest if present.
if let Some(actual_name) = metadata.sync_point_names.get(&file.path) { if let Some(snapshot_name) = instance_name {
snapshot.name = Cow::Owned(actual_name.clone()); snapshot.name = snapshot_name;
} }
} }