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

Check asset-path existence. Previously App just crashed if not (#345)

Browse Source 
* Check asset-path existence. Previously App just crashed if not

* rustfmt

* Relegated Error-message to ChannelAssetHandler

* Removed needless return statement
This commit is contained in:
Telzhaak 2020-08-26 21:08:51 +02:00 committed by GitHub
parent b718a2063d
commit 93040ef9a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_asset/src/load_request.rs
View File

@ -38,12 +38,19 @@ where
} }
fn load_asset(&self, load_request: &LoadRequest) -> Result<TAsset, AssetLoadError> { fn load_asset(&self, load_request: &LoadRequest) -> Result<TAsset, AssetLoadError> {
let mut file = File::open(&load_request.path)?; match File::open(&load_request.path) {
Ok(mut file) => {
let mut bytes = Vec::new(); let mut bytes = Vec::new();
file.read_to_end(&mut bytes)?; file.read_to_end(&mut bytes)?;
let asset = self.loader.from_bytes(&load_request.path, bytes)?; let asset = self.loader.from_bytes(&load_request.path, bytes)?;
Ok(asset) Ok(asset)
} }
Err(e) => Err(AssetLoadError::Io(std::io::Error::new(
e.kind(),
format!("{}", load_request.path.display()),
))),
}
}
} }
impl<TLoader, TAsset> AssetLoadRequestHandler for ChannelAssetHandler<TLoader, TAsset> impl<TLoader, TAsset> AssetLoadRequestHandler for ChannelAssetHandler<TLoader, TAsset>