Process Asset File Extensions With Multiple Dots

Fixes #1276
bevyengine · Jan 21, 2021 · b60126c · b60126c
1 parent a880b54
commit b60126c
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs
@@ -132,11 +132,27 @@ impl AssetServer {
         &self,
         path: P,
     ) -> Result<Arc<Box<dyn AssetLoader>>, AssetServerError> {
-        path.as_ref()
-            .extension()
-            .and_then(|e| e.to_str())
+        // Get filename
+        let s = path
+            .as_ref()
+            .file_name()
             .ok_or(AssetServerError::MissingAssetLoader(None))
-            .and_then(|extension| self.get_asset_loader(extension))
+            .and_then(|x| x.to_str().ok_or(AssetServerError::MissingAssetLoader(None)))?;
+
+        // If the filename has multiple dots, try to match on a multi-dot file extension
+        if s.split('.').count() > 1 {
+            if let Ok(loader) = self.get_asset_loader(&s[s.find('.').unwrap() + 1..]) {
+                return Ok(loader);
+            }
+        }
+
+        // Just get the file extension normaly if that doesn't work
+        let extension = &s[s
+            .rfind('.')
+            .ok_or(AssetServerError::MissingAssetLoader(None))?
+            + 1..];
+
+        self.get_asset_loader(extension)
     }
 
     pub fn get_handle_path<H: Into<HandleId>>(&self, handle: H) -> Option<AssetPath<'_>> {