From c1dcc74e0f48f381297adba4c632ec5e14d578d8 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Sun, 7 Jun 2020 11:45:18 -0700
Subject: [PATCH] asset: make asset folder loading permissive of non-assets

---
 crates/bevy_asset/src/asset_server.rs | 44 ++++++++++++++++++++-------
 examples/asset/asset_loading.rs       |  2 +-
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs
index c374a6d653..40fa0fcce3 100644
--- a/crates/bevy_asset/src/asset_server.rs
+++ b/crates/bevy_asset/src/asset_server.rs
@@ -127,7 +127,10 @@ impl AssetServer {
         self.loaders.push(resources);
     }
 
-    pub fn load_asset_folder<P: AsRef<Path>>(&self, path: P) -> Result<Vec<HandleId>, AssetServerError> {
+    pub fn load_asset_folder<P: AsRef<Path>>(
+        &self,
+        path: P,
+    ) -> Result<Vec<HandleId>, AssetServerError> {
         let root_path = self.get_root_path()?;
         let asset_folder = root_path.join(path);
         let handle_ids = self.load_assets_in_folder_recursive(&asset_folder)?;
@@ -285,7 +288,13 @@ impl AssetServer {
                         .get(path)
                         .and_then(|handle_id| asset_info.get_mut(&handle_id))
                     {
-                        asset_info.load_state = if let LoadState::Loaded(_version) = asset_info.load_state { new_version += 1; LoadState::Loading(new_version) } else { LoadState::Loading(new_version) };
+                        asset_info.load_state =
+                            if let LoadState::Loaded(_version) = asset_info.load_state {
+                                new_version += 1;
+                                LoadState::Loading(new_version)
+                            } else {
+                                LoadState::Loading(new_version)
+                            };
                         asset_info.handle_id
                     } else {
                         let handle_id = HandleId::new();
@@ -333,9 +342,13 @@ impl AssetServer {
                 }
             });
     }
-    
+
     pub fn get_load_state_untyped(&self, handle_id: HandleId) -> Option<LoadState> {
-        self.asset_info.read().unwrap().get(&handle_id).map(|asset_info| asset_info.load_state.clone())
+        self.asset_info
+            .read()
+            .unwrap()
+            .get(&handle_id)
+            .map(|asset_info| asset_info.load_state.clone())
     }
 
     pub fn get_load_state<T>(&self, handle: Handle<T>) -> Option<LoadState> {
@@ -347,7 +360,9 @@ impl AssetServer {
         for handle_id in handle_ids.iter() {
             match self.get_load_state_untyped(*handle_id) {
                 Some(LoadState::Loaded(_)) => continue,
-                Some(LoadState::Loading(_)) => {load_state = LoadState::Loading(0);},
+                Some(LoadState::Loading(_)) => {
+                    load_state = LoadState::Loading(0);
+                }
                 Some(LoadState::Failed(_)) => return Some(LoadState::Failed(0)),
                 None => return None,
             }
@@ -406,7 +421,10 @@ impl AssetServer {
         });
     }
 
-    fn load_assets_in_folder_recursive(&self, path: &Path) -> Result<Vec<HandleId>, AssetServerError> {
+    fn load_assets_in_folder_recursive(
+        &self,
+        path: &Path,
+    ) -> Result<Vec<HandleId>, AssetServerError> {
         if !path.is_dir() {
             return Err(AssetServerError::AssetFolderNotADirectory(
                 path.to_str().unwrap().to_string(),
@@ -418,17 +436,21 @@ impl AssetServer {
         for entry in fs::read_dir(path)? {
             let entry = entry?;
             let child_path = entry.path();
-            if !child_path.is_dir() {
+            if child_path.is_dir() {
+                handle_ids.extend(self.load_assets_in_folder_recursive(&child_path)?);
+            } else {
                 let relative_child_path = child_path.strip_prefix(&root_path).unwrap();
-                let handle = self.load_untyped(
+                let handle = match self.load_untyped(
                     relative_child_path
                         .to_str()
                         .expect("Path should be a valid string"),
-                )?;
+                ) {
+                    Ok(handle) => handle,
+                    Err(AssetServerError::MissingAssetHandler) => continue,
+                    Err(err) => Err(err)?,
+                };
 
                 handle_ids.push(handle);
-            } else {
-                handle_ids.extend(self.load_assets_in_folder_recursive(&child_path)?);
             }
         }
 
diff --git a/examples/asset/asset_loading.rs b/examples/asset/asset_loading.rs
index 29686cab26..2140090783 100644
--- a/examples/asset/asset_loading.rs
+++ b/examples/asset/asset_loading.rs
@@ -9,7 +9,7 @@ fn main() {
 
 fn setup(
     command_buffer: &mut CommandBuffer,
-    mut asset_server: ResMut<AssetServer>,
+    asset_server: Res<AssetServer>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {