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

Field name fix, clean up project paths

Browse Source
This commit is contained in:
Lucien Greathouse
2018-12-03 17:19:44 -08:00
parent e4379e29af
commit e4d3c3b045
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/rbx_session.rs
View File

@@ -198,7 +198,7 @@ fn construct_initial_tree(
construct_project_node( construct_project_node(
&mut context, &mut context,
None, None,
&project.name, "",
&project.name, &project.name,
&project.tree, &project.tree,
); );
@@ -258,7 +258,12 @@ fn construct_instance_node(
let id = insert_or_create_tree(context, parent_instance_id, instance); let id = insert_or_create_tree(context, parent_instance_id, instance);
for (child_name, child_project_node) in &project_node.children { for (child_name, child_project_node) in &project_node.children {
let child_path = format!("{}/{}", instance_path, child_name); let child_path = if instance_path.is_empty() {
child_name.clone()
} else {
format!("{}/{}", instance_path, child_name)
};
construct_project_node(context, Some(id), &child_path, child_name, child_project_node); construct_project_node(context, Some(id), &child_path, child_name, child_project_node);
} }

4
server/src/web.rs
View File

@@ -27,7 +27,7 @@ pub struct ServerInfoResponse<'a> {
pub protocol_version: u64, pub protocol_version: u64,
pub root_instance_id: RbxId, pub root_instance_id: RbxId,
pub project: Cow<'a, Project>, pub project: Cow<'a, Project>,
pub project_paths_to_ids: Cow<'a, HashMap<RbxId, String>>, pub ids_to_project_paths: Cow<'a, HashMap<RbxId, String>>,
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
@@ -80,7 +80,7 @@ impl Server {
session_id: self.session.session_id, session_id: self.session.session_id,
root_instance_id: tree.get_root_id(), root_instance_id: tree.get_root_id(),
project: Cow::Borrowed(&self.session.project), project: Cow::Borrowed(&self.session.project),
project_paths_to_ids: Cow::Borrowed(rbx_session.get_project_path_map()), ids_to_project_paths: Cow::Borrowed(rbx_session.get_project_path_map()),
}) })
}, },