Merge pull request 'reloading' (#1) from wip into master

Reviewed-on: #1

.cargo/config.toml

@@ -1,2 +0,0 @@
-[profile.dev.package."*"]
-opt-level = 2

.gitignore

@@ -1 +1,3 @@
 /target
+Cargo.lock
+.cargo

Cargo.toml

@@ -39,7 +39,7 @@ optional = true
 features = ["serde"]
 
 [dependencies.bevy_mod_scripting]
-version = "0.9"
+version = "0.11"
 features = ["lua54", "bevy_bindings"]
 
 [dependencies.bevy_basic_interaction]

src/commands.rs

@@ -59,7 +59,7 @@ impl Command for DirworldLockDoorCommand {
                         .take_read_buffer()
                         .take_remaining()
                         .iter()
-                        .map(|&i| i),
+                        .copied(),
                 );
                 match result {
                     BufferResult::BufferUnderflow => break,
@@ -75,7 +75,7 @@ impl Command for DirworldLockDoorCommand {
 
             // Insert key hash as payload relationship
             let key_digest = md5::compute(&self.key[..16]);
-            let mut payload = payload.unwrap_or_else(|| DirworldEntityPayload::new());
+            let mut payload = payload.unwrap_or_else(DirworldEntityPayload::new);
             let relationships = payload.relationships.get_or_insert_default();
             relationships.insert("key".into(), key_digest.0);
 
@@ -125,7 +125,7 @@ impl Command for DirworldUnlockDoorCommand {
                         .take_read_buffer()
                         .take_remaining()
                         .iter()
-                        .map(|&i| i),
+                        .copied(),
                 );
                 match result {
                     BufferResult::BufferUnderflow => break,
@@ -154,7 +154,7 @@ impl Command for DirworldUnlockDoorCommand {
                 let new_path = parent.join(path.file_stem_no_extensions().unwrap());
                 let _ = fs::create_dir(new_path.clone());
                 command_queue.push(DirworldSaveEntityCommand {
-                    path: new_path.into(),
+                    path: new_path,
                     payload,
                 });
                 return Some(command_queue);
@@ -265,7 +265,7 @@ pub trait DirworldCommands {
     fn dirworld_save_entity(&mut self, path: PathBuf, payload: DirworldEntityPayload);
 }
 
-impl<'w, 's> DirworldCommands for Commands<'w, 's> {
+impl DirworldCommands for Commands<'_, '_> {
     fn dirworld_lock_door(&mut self, path: PathBuf, key: Vec<u8>) {
         self.queue(DirworldLockDoorCommand { key, path });
     }

src/conditionals.rs

@@ -82,7 +82,7 @@ impl Condition {
             Condition::ChildOf { .. } => "conditional_child_of",
             Condition::ParentOf { .. } => "conditional_parent_of",
             Condition::DescendantOf { .. } => "conditional_descendant_of",
-            Condition::AncestorOf { .. } =>"conditional_ancestor_of",
+            Condition::AncestorOf { .. } => "conditional_ancestor_of",
             Condition::InRoom(_) => "conditional_in_room",
             Condition::ObjectInRoom(_) => "conditional_object_in_room",
         }
@@ -93,51 +93,37 @@ impl Condition {
         match name {
             "conditional_true" => Some(Condition::True),
             "conditional_child_of" => {
-                let Some(child) = args.get(0).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
-                let Some(parent) = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
+                let child = args.first().and_then(|arg| Uuid::parse_str(arg).ok())?;
+                let parent = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok())?;
                 Some(Condition::ChildOf { child, parent })
             }
             "conditional_parent_of" => {
-                let Some(child) = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
-                let Some(parent) = args.get(0).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
+                let child = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok())?;
+                let parent = args.first().and_then(|arg| Uuid::parse_str(arg).ok())?;
                 Some(Condition::ParentOf { child, parent })
             }
             "conditional_descendant_of" => {
-                let Some(descendant) = args.get(0).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
-                let Some(ancestor) = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
-                Some(Condition::DescendantOf { descendant, ancestor })
+                let descendant = args.first().and_then(|arg| Uuid::parse_str(arg).ok())?;
+                let ancestor = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok())?;
+                Some(Condition::DescendantOf {
+                    descendant,
+                    ancestor,
+                })
             }
             "conditional_ancestor_of" => {
-                let Some(descendant) = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
-                let Some(ancestor) = args.get(0).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
-                Some(Condition::AncestorOf { descendant, ancestor })
+                let descendant = args.get(1).and_then(|arg| Uuid::parse_str(arg).ok())?;
+                let ancestor = args.first().and_then(|arg| Uuid::parse_str(arg).ok())?;
+                Some(Condition::AncestorOf {
+                    descendant,
+                    ancestor,
+                })
             }
             "condtitional_in_room" => {
-                let Some(room_id) = args.get(0).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
+                let room_id = args.first().and_then(|arg| Uuid::parse_str(arg).ok())?;
                 Some(Condition::InRoom(room_id))
             }
             "condtitional_object_in_room" => {
-                let Some(object_id) = args.get(0).and_then(|arg| Uuid::parse_str(arg).ok()) else {
-                    return None;
-                };
+                let object_id = args.first().and_then(|arg| Uuid::parse_str(arg).ok())?;
                 Some(Condition::ObjectInRoom(object_id))
             }
             _ => None,
@@ -169,9 +155,7 @@ fn ancestor_of(world: &mut World, ancestor: Uuid, descendant: Uuid) -> bool {
         return false;
     };
 
-    AncestorIter::new(&parents, descendant_entity)
-        .find(|descendant| *descendant == ancestor_entity)
-        .is_some()
+    AncestorIter::new(&parents, descendant_entity).any(|descendant| descendant == ancestor_entity)
 }
 
 fn parent_of(world: &mut World, parent: Uuid, child: Uuid) -> bool {
@@ -203,18 +187,18 @@ fn parent_of(world: &mut World, parent: Uuid, child: Uuid) -> bool {
 
 fn in_room(world: &mut World, room: Uuid) -> bool {
     let current_dir = world.resource::<DirworldCurrentDir>();
-    current_dir.payload.as_ref().is_some_and(|payload| payload.id == room)
+    current_dir
+        .payload
+        .as_ref()
+        .is_some_and(|payload| payload.id == room)
 }
 
 fn object_in_room(world: &mut World, object: Uuid) -> bool {
     let mut dirworld_entities = world.query::<&DirworldEntity>();
-    dirworld_entities
-        .iter(world)
-        .find(|entity| {
+    dirworld_entities.iter(world).any(|entity| {
         entity
             .payload
             .as_ref()
             .is_some_and(|payload| payload.id == object)
     })
-        .is_some()
 }

src/lib.rs

@@ -1,4 +1,6 @@
 #![warn(missing_docs)]
+#![allow(clippy::too_many_arguments)]
+#![allow(clippy::type_complexity)]
 
 //! Plugin for bevy engine enabling interaction with and representation of the file system in the world.
 
@@ -131,7 +133,7 @@ impl Extensions for PathBuf {
 
     fn file_stem_no_extensions(&self) -> Option<String> {
         let mut temp_path = self.clone();
-        while let Some(_) = temp_path.extension() {
+        while temp_path.extension().is_some() {
             temp_path.set_extension("");
         }
         temp_path
@@ -142,7 +144,7 @@ impl Extensions for PathBuf {
 
     fn no_extensions(&self) -> PathBuf {
         let mut temp_path = self.clone();
-        while let Some(_) = temp_path.extension() {
+        while temp_path.extension().is_some() {
             temp_path.set_extension("");
         }
         temp_path

src/lua_api.rs

@@ -190,10 +190,7 @@ fn condition_child_of(
     result
 }
 
-fn condition_in_room(
-    ctx: FunctionCallContext, 
-    room: String,
-) -> Result<bool, InteropError> {
+fn condition_in_room(ctx: FunctionCallContext, room: String) -> Result<bool, InteropError> {
     let Ok(room) = Uuid::from_str(&room) else {
         warn!("Provided room is not a valid UUID");
         return Ok(false);
@@ -208,7 +205,7 @@ fn condition_in_room(
 
 fn condition_object_in_room(
     ctx: FunctionCallContext,
-    object: String
+    object: String,
 ) -> Result<bool, InteropError> {
     let Ok(object) = Uuid::from_str(&object) else {
         warn!("Provided object is not a valid UUID");

src/observers.rs

@@ -13,7 +13,7 @@ use crate::{
     events::{
         DirworldChangeRoot, DirworldEnterRoom, DirworldLeaveRoom,
     },
-    preload::{load_entity, DirworldPreloadBegin, PreloadState, RoomAssets},
+    preload::{load_entity, reload_entity, DirworldPreloadBegin, PreloadState, ReloadPaths, RoomAssets},
     resources::{
         DirworldCodecs, DirworldCurrentDir, DirworldObservers, DirworldRootDir, DirworldTasks,
     },
@@ -38,19 +38,19 @@ pub fn navigate_from_room(
 
 pub fn navigate_to_room(
     trigger: Trigger<DirworldEnterRoom>,
+    mut commands: Commands,
+    mut event_writer: EventWriter<DirworldEnterRoom>,
+    mut preload_event_writer: EventWriter<DirworldPreloadBegin>,
     root_dir: Res<DirworldRootDir>,
     mut cache: ResMut<DirworldCache>,
     observers: Res<DirworldObservers>,
     codecs: Res<DirworldCodecs>,
-    mut commands: Commands,
-    mut event_writer: EventWriter<DirworldEnterRoom>,
-    mut preload_event_writer: EventWriter<DirworldPreloadBegin>,
     mut current_dir: ResMut<DirworldCurrentDir>,
     mut next_preload_state: ResMut<NextState<PreloadState>>,
     mut room_assets: ResMut<RoomAssets>,
     mut dirworld_tasks: ResMut<DirworldTasks>,
-    persitent_entities: Query<&DirworldEntity, With<Persist>>,
     mut time: ResMut<Time<Physics>>,
+    persitent_entities: Query<&DirworldEntity, With<Persist>>,
 ) {
     time.pause();
     dirworld_tasks.insert("Loading Room".into(), None);
@@ -67,8 +67,7 @@ pub fn navigate_to_room(
     let entries = match path.read_dir() {
         Ok(entries) => entries
             .flatten()
-            .map(|entry| entry.path().canonicalize())
-            .flatten()
+            .flat_map(|entry| entry.path().canonicalize())
             .filter(|entry| {
                 !entry
                     .file_name()
@@ -117,12 +116,9 @@ pub fn handle_changes(
     dirworld_entities: Query<(Entity, &DirworldEntity)>,
     observers: Res<DirworldObservers>,
     codecs: Res<DirworldCodecs>,
-    mut cache: ResMut<DirworldCache>,
     mut event_writer: EventWriter<DirworldWatcherEvent>,
-    mut next_preload_state: ResMut<NextState<PreloadState>>,
     mut room_assets: ResMut<RoomAssets>,
-    persitent_entities: Query<&DirworldEntity, With<Persist>>,
-    root_dir: Res<DirworldRootDir>,
+    mut reload_paths: ResMut<ReloadPaths>,
 ) {
     let event = &trigger.event().0;
     info!("Watcher Event: {event:?}");
@@ -134,45 +130,36 @@ pub fn handle_changes(
         }
         EventKind::Create(_) | EventKind::Modify(ModifyKind::Name(RenameMode::To)) => {
             for path in &event.paths {
-                load_entity(
-                    &path,
-                    &mut cache,
+                reload_entity(
+                    path,
                     &codecs,
                     &observers,
                     &mut commands,
-                    &mut next_preload_state,
                     &mut room_assets,
-                    &root_dir,
-                    &persitent_entities,
+                    &mut reload_paths,
                 );
             }
         }
         EventKind::Modify(ModifyKind::Name(RenameMode::Both)) => {
             despawn_entity_by_path(&mut commands, &dirworld_entities, &event.paths[0]);
-            load_entity(
+            reload_entity(
                 &event.paths[1],
-                &mut cache,
                 &codecs,
                 &observers,
                 &mut commands,
-                &mut next_preload_state,
                 &mut room_assets,
-                &root_dir,
-                &persitent_entities,
+                &mut reload_paths,
             );
         }
         EventKind::Modify(ModifyKind::Metadata(MetadataKind::Any)) => {
             despawn_entity_by_path(&mut commands, &dirworld_entities, &event.paths[1]);
-            load_entity(
+            reload_entity(
                 &event.paths[0],
-                &mut cache,
                 &codecs,
                 &observers,
                 &mut commands,
-                &mut next_preload_state,
                 &mut room_assets,
-                &root_dir,
-                &persitent_entities,
+                &mut reload_paths,
             );
         }
         _ => {

src/payload/mod.rs

@@ -40,4 +40,3 @@ impl DirworldEntityPayload {
         }
     }
 }
-

src/preload/mod.rs

@@ -31,8 +31,10 @@ impl Plugin for DirworldPreloadPlugin {
                 systems::handle_preload.run_if(in_state(PreloadState::Loading)),
             ),
         )
-        .add_systems(OnEnter(PreloadState::Done), systems::handle_spawn)
+        .add_systems(OnEnter(PreloadState::Spawning), systems::handle_spawn)
+        .add_systems(Update, systems::handle_reloads.run_if(in_state(PreloadState::Done)))
         .add_event::<DirworldPreloadBegin>()
+        .init_resource::<ReloadPaths>()
         .insert_resource(PreloadPaths {
             src: PathBuf::new(),
             dst: PathBuf::new(),
@@ -48,11 +50,66 @@ pub enum PreloadState {
     /// Indicates assets are in the process of loading
     #[default]
     Loading,
+    /// Initial Spawning
+    Spawning,
     /// Indicates all room assets are finished loading, i.e. all assets are loaded with
     /// dependencies
     Done,
 }
 
+/// Begins the reload process for an entity
+pub fn reload_entity(
+    entry: &PathBuf,
+    codecs: &DirworldCodecs,
+    observers: &DirworldObservers,
+    commands: &mut Commands,
+    room_assets: &mut RoomAssets,
+    reload_paths: &mut ReloadPaths,
+) {
+    let (payload, data) = extract_entity_payload(entry, codecs);
+    let entry_type = if entry.is_dir() {
+        EntryType::Folder
+    } else {
+        EntryType::File(entry.extensions())
+    };
+    let transform = if entry.file_name().is_none() {
+        payload
+            .as_ref()
+            .map(|payload| {
+                payload
+                    .door_destination
+                    .as_ref()
+                    .expect("Door destination missing from payload!")
+                    .0
+            })
+            .unwrap_or_default()
+    } else {
+        payload
+            .as_ref()
+            .map(|payload| payload.transform.0)
+            .unwrap_or_default()
+    };
+    info!("{transform:?}");
+    let entity = commands
+        .spawn((
+            transform,
+            Visibility::Inherited,
+            DirworldEntity {
+                path: entry.clone(),
+                payload,
+            },
+        ))
+        .id();
+
+    info!("Entity: {entity:?}");
+    if let Some(observer) = observers.get(&entry_type) {
+        reload_paths.push(entry.clone());
+        room_assets.insert(entry.clone(), HashMap::default());
+        commands.trigger_targets(DirworldPreload { entity, data }, *observer);
+        info!("Triggered reload for {entry:?}");
+    }
+}
+
 /// Initiates loading of an asset
 // TODO: Make into a command extension
 pub fn load_entity(
@@ -67,7 +124,7 @@ pub fn load_entity(
     persistent_entities: &Query<&DirworldEntity, With<Persist>>,
 ) {
     info!("Entity: {entry:?}");
-    if persistent_entities.iter().find(|e| e.path == *entry).is_some() {
+    if persistent_entities.iter().any(|e| e.path == *entry) {
         info!("Entity is persistent, skipping...");
         return;
     }
@@ -75,8 +132,8 @@ pub fn load_entity(
         info!("Entity is root directory, skipping...");
         return;
     }
-    let (mut payload, data) = extract_entity_payload(&entry, &codecs);
-    payload = payload.map(|p| cache.get_entity_cache(&entry).unwrap_or(p));
+    let (mut payload, data) = extract_entity_payload(entry, codecs);
+    payload = payload.map(|p| cache.get_entity_cache(entry).unwrap_or(p));
     let entry_type = if entry.is_dir() {
         EntryType::Folder
     } else {
@@ -112,7 +169,7 @@ pub fn load_entity(
     if let Some(observer) = observers.get(&entry_type) {
         preload_state.set(PreloadState::Loading);
         room_assets.insert(entry.clone(), HashMap::default());
-        commands.trigger_targets(DirworldPreload { entity, data }, observer.clone());
+        commands.trigger_targets(DirworldPreload { entity, data }, *observer);
         info!("Triggered preload for {entry:?}");
     }
 }

src/preload/resources.rs

@@ -14,3 +14,7 @@ pub struct PreloadPaths {
     /// Path of current room
     pub dst: PathBuf,
 }
+
+/// Paths which are currently in the process of being reloaded
+#[derive(Resource, Deref, DerefMut, Debug, Default)]
+pub struct ReloadPaths(Vec<PathBuf>);

src/preload/systems.rs

@@ -8,9 +8,7 @@ use crate::{
     Extensions,
 };
 
-use super::{
-    DirworldPreloadBegin, PreloadPaths, PreloadState, RoomAssets,
-};
+use super::{DirworldPreloadBegin, PreloadPaths, PreloadState, ReloadPaths, RoomAssets};
 
 pub fn cache_preload_paths(
     mut event_reader: EventReader<DirworldPreloadBegin>,
@@ -35,7 +33,7 @@ pub fn handle_preload(
             .all(|a| asset_server.is_loaded_with_dependencies(a))
     {
         info!("Preload Done.");
-        next_state.set(PreloadState::Done);
+        next_state.set(PreloadState::Spawning);
         dirworld_tasks.remove("Loading Room");
     }
 }
@@ -47,6 +45,7 @@ pub fn handle_spawn(
     observers: Res<DirworldObservers>,
     mut event_writer: EventWriter<DirworldNavigationComplete>,
     mut time: ResMut<Time<Physics>>,
+    mut next_state: ResMut<NextState<PreloadState>>,
 ) {
     info!("Spawning");
     for (entity, DirworldEntity { path, .. }) in dirworld_entity_query.iter() {
@@ -57,7 +56,7 @@ pub fn handle_spawn(
         };
         if let Some(observer) = observers.get(&entry_type) {
             info!("Found observer {observer:?} for {entry_type:?}");
-            commands.trigger_targets(DirworldSpawn(entity), observer.clone());
+            commands.trigger_targets(DirworldSpawn(entity), *observer);
         }
     }
     time.unpause();
@@ -65,4 +64,44 @@ pub fn handle_spawn(
         from: preload_paths.src.clone(),
         to: preload_paths.dst.clone(),
     });
+    next_state.set(PreloadState::Done);
+}
+
+pub fn handle_reloads(
+    room_assets: ResMut<RoomAssets>,
+    mut reload_paths: ResMut<ReloadPaths>,
+    asset_server: Res<AssetServer>,
+    observers: Res<DirworldObservers>,
+    dirworld_entity_query: Query<(Entity, &DirworldEntity), Without<Persist>>,
+    mut commands: Commands,
+) {
+    reload_paths.retain(|reload_path| {
+        let mut result = true;
+        if let Some(assets) = room_assets.get(reload_path) {
+            if assets
+                .values()
+                .all(|asset| asset_server.is_loaded_with_dependencies(asset))
+            {
+                result = false;
+            }
+        } else {
+            result = false;
+        }
+        if !result {
+            let (entity, _) = dirworld_entity_query
+                .iter()
+                .find(|(_, DirworldEntity { path, .. })| path == reload_path)
+                .unwrap();
+            let entry_type = if reload_path.is_dir() {
+                EntryType::Folder
+            } else {
+                EntryType::File(reload_path.extensions())
+            };
+            if let Some(observer) = observers.get(&entry_type) {
+                info!("RELOAD: Found observer {observer:?} for {entry_type:?}");
+                commands.trigger_targets(DirworldSpawn(entity), *observer);
+            }
+        }
+        result
+    });
 }

src/systems.rs

@@ -18,16 +18,3 @@ pub fn remove_completed_tasks(mut commands: Commands, mut tasks: ResMut<Dirworld
         None => true,
     });
 }
-
-// pub fn sync_entity_transforms(
-//     mut dirworld_entity_query: Query<(&mut DirworldEntity, Ref<Transform>, &GlobalTransform)>,
-// ) {
-//     for (mut dirworld_entity, transform, global_transform) in dirworld_entity_query.iter_mut() {
-//         if transform.is_changed() && !transform.is_added() {
-//             if let Some(payload) = &mut dirworld_entity.payload {
-//                 let transform = global_transform.compute_transform();
-//                 *payload.transform = transform;
-//             }
-//         }
-//     }
-// }

src/utils.rs

@@ -17,7 +17,9 @@ pub fn extract_entity_payload(
 
     if path.is_dir() {
         let payload_file_path = if path.file_name().is_none() {
-            path.parent().expect(".. missing parent somehow").join(".door")
+            path.parent()
+                .expect(".. missing parent somehow")
+                .join(".door")
         } else {
             path.join(".door")
         };
@@ -34,14 +36,12 @@ pub fn extract_entity_payload(
                 }
             }
         }
-    } else {
-        if let Some(extensions) = path.extensions() {
-            if let Ok(file_data) = fs::read(&path) {
+    } else if let Some(extensions) = path.extensions() {
+        if let Ok(file_data) = fs::read(path) {
             if let Some(codec) = codecs.get(&extensions) {
                 match codec.decode(&file_data) {
                     Ok((carrier, extracted_payload)) => {
-                            match rmp_serde::from_slice::<DirworldEntityPayload>(&extracted_payload)
-                            {
+                        match rmp_serde::from_slice::<DirworldEntityPayload>(&extracted_payload) {
                             Ok(deserialized_payload) => {
                                 data = Some(carrier);
                                 payload = Some(deserialized_payload);
@@ -64,7 +64,6 @@ pub fn extract_entity_payload(
             }
         }
     }
-    }
 
     (payload, data)
 }

src/watcher.rs

@@ -1,7 +1,4 @@
-use std::{
-    path::PathBuf,
-    time::Duration,
-};
+use std::{path::PathBuf, time::Duration};
 
 use async_channel::{Receiver, Sender};
 use bevy::{prelude::*, tasks::IoTaskPool};

src/yarnspinner_api.rs

@@ -1,8 +1,6 @@
 use bevy::{log::info, prelude::World};
 use lazy_static::lazy_static;
-use std::sync::{
-    Arc, Condvar, Mutex,
-};
+use std::sync::{Arc, Condvar, Mutex};
 
 use crate::{actor::resources::FunctionLibrary, conditionals::Condition};
 
@@ -28,7 +26,7 @@ pub fn setup_yarnspinner_functions(library: &mut FunctionLibrary) {
 
 pub fn process_commands(world: &mut World) {
     let command_count = YARNSPINNER_COMMAND_COUNT.1.lock().unwrap();
-    if *command_count <= 0 { 
+    if *command_count == 0 {
         return;
     }
 
@@ -41,7 +39,7 @@ pub fn process_commands(world: &mut World) {
     }
 
     let mut command_count = YARNSPINNER_COMMAND_COUNT.1.lock().unwrap();
-    while !*command_count <= 0 {
+    while !*command_count == 0 {
         info!("Command Count: {}", *command_count);
         command_count = YARNSPINNER_COMMAND_COUNT.0.wait(command_count).unwrap();
     }