change asset path mappers to use actual asset path

Author: makspll

crates/bevy_mod_scripting_core/src/asset.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use bevy::{
     app::{App, PreUpdate},
-    asset::{Asset, AssetEvent, AssetId, AssetLoader, Assets},
+    asset::{Asset, AssetEvent, AssetId, AssetLoader, AssetPath, Assets},
     ecs::system::Resource,
     log::{debug, error, info, trace},
     prelude::{
@@ -16,10 +16,7 @@ use bevy::{
     reflect::TypePath,
     utils::HashMap,
 };
-use std::{
-    borrow::Cow,
-    path::{Path, PathBuf},
-};
+use std::borrow::Cow;
 
 /// Represents a scripting language. Languages which compile into another language should use the target language as their language.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
@@ -49,7 +46,7 @@ impl std::fmt::Display for Language {
 pub struct ScriptAsset {
     pub content: Box<[u8]>,
     /// The virtual filesystem path of the asset, used to map to the script Id for asset backed scripts
-    pub asset_path: PathBuf,
+    pub asset_path: AssetPath<'static>,
 }
 
 #[derive(Event, Debug, Clone)]
@@ -90,7 +87,7 @@ impl AssetLoader for ScriptAssetLoader {
         }
         let asset = ScriptAsset {
             content: content.into_boxed_slice(),
-            asset_path: load_context.path().to_owned(),
+            asset_path: load_context.asset_path().to_owned(),
         };
         Ok(asset)
     }
@@ -107,7 +104,7 @@ pub struct ScriptAssetSettings {
 }
 
 impl ScriptAssetSettings {
-    pub fn select_script_language(&self, path: &Path) -> Language {
+    pub fn select_script_language(&self, path: &AssetPath) -> Language {
         for mapper in &self.script_language_mappers {
             let language = (mapper.map)(path);
             match language {
@@ -124,7 +121,7 @@ impl Default for ScriptAssetSettings {
     fn default() -> Self {
         Self {
             script_id_mapper: AssetPathToScriptIdMapper {
-                map: (|path: &Path| path.to_string_lossy().into_owned().into()),
+                map: (|path: &AssetPath| path.path().to_string_lossy().into_owned().into()),
             },
             script_language_mappers: vec![],
         }
@@ -134,12 +131,12 @@ impl Default for ScriptAssetSettings {
 /// Strategy for mapping asset paths to script ids, by default this is the identity function
 #[derive(Clone, Copy)]
 pub struct AssetPathToScriptIdMapper {
-    pub map: fn(&Path) -> ScriptId,
+    pub map: fn(&AssetPath) -> ScriptId,
 }
 
 #[derive(Clone, Copy)]
 pub struct AssetPathToLanguageMapper {
-    pub map: fn(&Path) -> Language,
+    pub map: fn(&AssetPath) -> Language,
 }
 
 /// A cache of asset id's to their script id's. Necessary since when we drop an asset we won't have the ability to get the path from the asset.
@@ -333,6 +330,8 @@ pub(crate) fn configure_asset_systems_for_plugin<P: IntoScriptPluginParams>(
 
 #[cfg(test)]
 mod tests {
+    use std::path::{Path, PathBuf};
+
     use bevy::{
         app::{App, Update},
         asset::{AssetApp, AssetPlugin, AssetServer, Assets, Handle, LoadState},
@@ -352,12 +351,12 @@ mod tests {
     fn make_test_settings() -> ScriptAssetSettings {
         ScriptAssetSettings {
             script_id_mapper: AssetPathToScriptIdMapper {
-                map: |path| path.to_string_lossy().into_owned().into(),
+                map: |path| path.path().to_string_lossy().into_owned().into(),
             },
             script_language_mappers: vec![
                 AssetPathToLanguageMapper {
                     map: |path| {
-                        if path.extension().unwrap() == "lua" {
+                        if path.path().extension().unwrap() == "lua" {
                             Language::Lua
                         } else {
                             Language::Unknown
@@ -366,7 +365,7 @@ mod tests {
                 },
                 AssetPathToLanguageMapper {
                     map: |path| {
-                        if path.extension().unwrap() == "rhai" {
+                        if path.path().extension().unwrap() == "rhai" {
                             Language::Rhai
                         } else {
                             Language::Unknown
@@ -427,7 +426,7 @@ mod tests {
 
         assert_eq!(
             asset.asset_path,
-            PathBuf::from("test_assets/test_script.script")
+            AssetPath::from_path(&PathBuf::from("test_assets/test_script.script"))
         );
 
         assert_eq!(
@@ -457,7 +456,7 @@ mod tests {
 
         assert_eq!(
             asset.asset_path,
-            PathBuf::from("test_assets/test_script.script")
+            AssetPath::from(PathBuf::from("test_assets/test_script.script"))
         );
         assert_eq!(
             String::from_utf8(asset.content.clone().to_vec()).unwrap(),
@@ -485,14 +484,14 @@ mod tests {
     fn test_script_asset_settings_select_language() {
         let settings = make_test_settings();
 
-        let path = Path::new("test.lua");
-        assert_eq!(settings.select_script_language(path), Language::Lua);
+        let path = AssetPath::from(Path::new("test.lua"));
+        assert_eq!(settings.select_script_language(&path), Language::Lua);
         assert_eq!(
-            settings.select_script_language(Path::new("test.rhai")),
+            settings.select_script_language(&AssetPath::from(Path::new("test.rhai"))),
             Language::Rhai
         );
         assert_eq!(
-            settings.select_script_language(Path::new("test.blob")),
+            settings.select_script_language(&AssetPath::from(Path::new("test.blob"))),
             Language::Unknown
         );
     }

crates/languages/bevy_mod_scripting_lua/src/lib.rs

@@ -1,5 +1,6 @@
 use bevy::{
     app::Plugin,
+    asset::AssetPath,
     ecs::{entity::Entity, world::World},
 };
 use bevy_mod_scripting_core::{
@@ -133,8 +134,8 @@ impl Default for LuaScriptingPlugin {
     }
 }
 #[profiling::function]
-fn lua_language_mapper(path: &std::path::Path) -> Language {
-    match path.extension().and_then(|ext| ext.to_str()) {
+fn lua_language_mapper(path: &AssetPath) -> Language {
+    match path.path().extension().and_then(|ext| ext.to_str()) {
         Some("lua") => Language::Lua,
         _ => Language::Unknown,
     }

crates/languages/bevy_mod_scripting_rhai/src/lib.rs

@@ -1,5 +1,6 @@
 use bevy::{
     app::Plugin,
+    asset::AssetPath,
     ecs::{entity::Entity, world::World},
 };
 use bevy_mod_scripting_core::{
@@ -150,8 +151,8 @@ impl Default for RhaiScriptingPlugin {
     }
 }
 
-fn rhai_language_mapper(path: &std::path::Path) -> Language {
-    match path.extension().and_then(|ext| ext.to_str()) {
+fn rhai_language_mapper(path: &AssetPath) -> Language {
+    match path.path().extension().and_then(|ext| ext.to_str()) {
         Some("rhai") => Language::Rhai,
         _ => Language::Unknown,
     }