forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix asset loader registration warning (#11870)

Browse Source 
# Objective

When registering and preregistering asset loaders, there would be a
`warn!` if multiple asset loaders use a given extension, and an `info!`
if multiple asset loaders load the same asset type. Since both of these
situations are individually fine, it was decided that these messages
should be removed.

## Solution

Replace both of these messages with a new `warn!` that notes that if
multiple asset loaders share the same asset type _and_ share extensions,
that the loader must be specified in the `.meta` file for those assets
in order to solve the ambiguity. This is a more useful message, since it
notes when a user must take special action / consideration.
This commit is contained in:
thepackett 2024-02-16 10:30:10 -06:00 committed by GitHub
parent ebaa347afe
commit 16d710cb3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/bevy_asset/src/server/loaders.rs
View File

@ -3,7 +3,7 @@ use crate::{
path::AssetPath, path::AssetPath,
}; };
use async_broadcast::RecvError; use async_broadcast::RecvError;
use bevy_log::{error, info, warn}; use bevy_log::{error, warn};
use bevy_tasks::IoTaskPool; use bevy_tasks::IoTaskPool;
use bevy_utils::{HashMap, TypeIdMap}; use bevy_utils::{HashMap, TypeIdMap};
use std::{any::TypeId, sync::Arc}; use std::{any::TypeId, sync::Arc};
@ -40,6 +40,7 @@ impl AssetLoaders {
}; };
if is_new { if is_new {
let mut duplicate_extensions = Vec::new();
for extension in loader.extensions() { for extension in loader.extensions() {
let list = self let list = self
.extension_to_loaders .extension_to_loaders
@ -47,7 +48,7 @@ impl AssetLoaders {
.or_default(); .or_default();
if !list.is_empty() { if !list.is_empty() {
warn!("duplicate registration for extension `{extension}`."); duplicate_extensions.push(extension);
} }
list.push(loader_index); list.push(loader_index);
@ -60,8 +61,10 @@ impl AssetLoaders {
.entry(loader_asset_type) .entry(loader_asset_type)
.or_default(); .or_default();
if !list.is_empty() { let duplicate_asset_registration = !list.is_empty();
info!("duplicate registration for type `{loader_asset_type_name}`."); if !duplicate_extensions.is_empty() && duplicate_asset_registration {
warn!("Duplicate AssetLoader registered for Asset type `{loader_asset_type_name}` with extensions `{duplicate_extensions:?}`. \
Loader must be specified in a .meta file in order to load assets of this type with these extensions.");
} }
list.push(loader_index); list.push(loader_index);
@ -98,6 +101,7 @@ impl AssetLoaders {
self.preregistered_loaders.insert(type_name, loader_index); self.preregistered_loaders.insert(type_name, loader_index);
self.type_name_to_loader.insert(type_name, loader_index); self.type_name_to_loader.insert(type_name, loader_index);
let mut duplicate_extensions = Vec::new();
for extension in extensions { for extension in extensions {
let list = self let list = self
.extension_to_loaders .extension_to_loaders
@ -105,7 +109,7 @@ impl AssetLoaders {
.or_default(); .or_default();
if !list.is_empty() { if !list.is_empty() {
warn!("duplicate preregistration for extension `{extension}`."); duplicate_extensions.push(extension);
} }
list.push(loader_index); list.push(loader_index);
@ -116,8 +120,10 @@ impl AssetLoaders {
.entry(loader_asset_type) .entry(loader_asset_type)
.or_default(); .or_default();
if !list.is_empty() { let duplicate_asset_registration = !list.is_empty();
info!("duplicate preregistration for type `{loader_asset_type_name}`."); if !duplicate_extensions.is_empty() && duplicate_asset_registration {
warn!("Duplicate AssetLoader preregistered for Asset type `{loader_asset_type_name}` with extensions `{duplicate_extensions:?}`. \
Loader must be specified in a .meta file in order to load assets of this type with these extensions.");
} }
list.push(loader_index); list.push(loader_index);