diff --git a/server/src/rbx_session.rs b/server/src/rbx_session.rs index 21b033df..25e515c1 100644 --- a/server/src/rbx_session.rs +++ b/server/src/rbx_session.rs @@ -11,7 +11,7 @@ use log::{info, trace}; use rbx_tree::{RbxTree, RbxId}; use crate::{ - project::{Project, InstanceProjectNodeMetadata}, + project::Project, message_queue::MessageQueue, imfs::{Imfs, ImfsItem}, path_map::PathMap, @@ -41,11 +41,7 @@ pub struct RbxSession { // TODO(#105): Change metadata_per_path to PathMap> for // path aliasing. metadata_per_path: PathMap, - - // TODO: Hold this map, inverted from metadata_per_path - // metadata_per_instance: PathMap, - - instance_metadata_map: HashMap, + metadata_per_instance: HashMap, message_queue: Arc>, imfs: Arc>, } @@ -57,17 +53,17 @@ impl RbxSession { message_queue: Arc>, ) -> RbxSession { let mut metadata_per_path = PathMap::new(); - let mut instance_metadata_map = HashMap::new(); + let mut metadata_per_instance = HashMap::new(); let tree = { let temp_imfs = imfs.lock().unwrap(); - reify_initial_tree(&project, &temp_imfs, &mut metadata_per_path, &mut instance_metadata_map) + reify_initial_tree(&project, &temp_imfs, &mut metadata_per_path, &mut metadata_per_instance) }; RbxSession { tree, metadata_per_path, - instance_metadata_map, + metadata_per_instance, message_queue, imfs, } @@ -127,7 +123,7 @@ impl RbxSession { instance_id, &snapshot, &mut self.metadata_per_path, - &mut self.instance_metadata_map, + &mut self.metadata_per_instance, &mut changes, ); } @@ -183,7 +179,7 @@ impl RbxSession { } pub fn get_instance_metadata(&self, id: RbxId) -> Option<&MetadataPerInstance> { - self.instance_metadata_map.get(&id) + self.metadata_per_instance.get(&id) } pub fn debug_get_metadata_per_path(&self) -> &PathMap { @@ -193,15 +189,15 @@ impl RbxSession { pub fn construct_oneoff_tree(project: &Project, imfs: &Imfs) -> RbxTree { let mut metadata_per_path = PathMap::new(); - let mut instance_metadata_map = HashMap::new(); - reify_initial_tree(project, imfs, &mut metadata_per_path, &mut instance_metadata_map) + let mut metadata_per_instance = HashMap::new(); + reify_initial_tree(project, imfs, &mut metadata_per_path, &mut metadata_per_instance) } fn reify_initial_tree( project: &Project, imfs: &Imfs, metadata_per_path: &mut PathMap, - instance_metadata_map: &mut HashMap, + metadata_per_instance: &mut HashMap, ) -> RbxTree { let mut meta = SnapshotMetadata { metadata_per_path, @@ -211,7 +207,7 @@ fn reify_initial_tree( .expect("Project did not produce any instances"); let mut changes = InstanceChanges::default(); - let tree = reify_root(&snapshot, metadata_per_path, instance_metadata_map, &mut changes); + let tree = reify_root(&snapshot, metadata_per_path, metadata_per_instance, &mut changes); tree } \ No newline at end of file diff --git a/server/src/snapshot_reconciler.rs b/server/src/snapshot_reconciler.rs index 201c1ef0..2562c4cb 100644 --- a/server/src/snapshot_reconciler.rs +++ b/server/src/snapshot_reconciler.rs @@ -3,7 +3,6 @@ use std::{ borrow::Cow, collections::{HashMap, HashSet}, fmt, - path::PathBuf, }; use rbx_tree::{RbxTree, RbxId, RbxInstanceProperties, RbxValue}; diff --git a/server/src/web.rs b/server/src/web.rs index 2bf8c0f9..ccb7822c 100644 --- a/server/src/web.rs +++ b/server/src/web.rs @@ -17,7 +17,6 @@ use rbx_tree::{RbxId, RbxInstance}; use crate::{ session::Session, session_id::SessionId, - project::InstanceProjectNodeMetadata, snapshot_reconciler::InstanceChanges, visualize::{VisualizeRbxSession, VisualizeImfs, graphviz_to_svg}, rbx_session::{MetadataPerInstance},