[Merged by Bors] - Useful error message when two assets have the save UUID #3739
Conversation
|
I think we should check whether the two assets actually have different types, as registration would ideally be idempotent. |
This will be handled by #3560 |
alice-i-cecile
added
A-Assets
| panic!("Error while registering new asset type. Asset with UUID: {:?} is already registered. Can not register another type with the same UUID", | ||
| T::TYPE_UUID); |
There was a problem hiding this comment.
could you also log std::any::type_name::<T>() in the error?
There was a problem hiding this comment.
Ideally it would be possible to include the type name of the first type too, although I don't know if we store that information
There was a problem hiding this comment.
Added type name, but i don't think there is a way to get the original type. We only have trait object, so we can't get the type from it.
mockersf
added
the
S-Ready-For-Final-Review
| @@ -93,6 +93,15 @@ impl AssetServer { | |||
| } | |||
|
|
|||
| pub(crate) fn register_asset_type<T: Asset>(&self) -> Assets<T> { | |||
| if self | |||
There was a problem hiding this comment.
rather than grab a read lock and then a write lock immediately after, I think we should just grab a single write lock and reuse it across both cases (especially given that the "read only" case is the "unexpected" / "uncommon" case).
| self.server.asset_lifecycles.write().insert( | ||
| let mut asset_lifecycles = self.server.asset_lifecycles.write(); | ||
| if asset_lifecycles.contains_key(&T::TYPE_UUID) { | ||
| panic!("Error while registering new asset type: {:?} with UUID: {:?}. Another type with the same UUID is already registered. Can not register new asset type with the same UUID", | ||
| std::any::type_name::<T>(), T::TYPE_UUID); | ||
| } | ||
| asset_lifecycles.insert( | ||
| T::TYPE_UUID, | ||
| Box::new(AssetLifecycleChannel::<T>::default()), | ||
| ); |
There was a problem hiding this comment.
insert would return Some(_) if the value already exists, so this could be just
if self
.server
.asset_lifecycles
.write()
.insert(
T::TYPE_UUID,
Box::new(AssetLifecycleChannel::<T>::default()),
)
.is_some()
{
panic!("Error while registering new asset type: {:?} with UUID: {:?}. Another type with the same UUID is already registered. Can not register new asset type with the same UUID.",
std::any::type_name::<T>(), T::TYPE_UUID);
}
|
bors r+ |
bors
bot
changed the title
Objective
Fixes #2610 and #3731
Solution
Added check for TYPE_UUID duplication in
register_asset_typewith an error message