Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use PathBuf to load files

Browse Source 
Former-commit-id: b72084fab1b8faeabc47eee927654f963643bb78
This commit is contained in:
Louis Pearson 2019-05-18 11:23:56 -06:00
parent 14b28a4a17
commit d55e803ab5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/assets/mod.rs
View File

@ -7,6 +7,7 @@ use std::{
fs::File, fs::File,
io::BufReader, io::BufReader,
io::Read, io::Read,
path::PathBuf,
sync::{Arc, RwLock}, sync::{Arc, RwLock},
}; };
@ -92,8 +93,9 @@ impl Asset for DotVoxData {
// TODO: System to load file from specifiers (e.g.: "core.ui.backgrounds.city"). // TODO: System to load file from specifiers (e.g.: "core.ui.backgrounds.city").
fn try_open_with_path(name: &str) -> Option<File> { fn try_open_with_path(name: &str) -> Option<File> {
debug!("Trying to access \"{}\"", name); debug!("Trying to access \"{}\"", name);
// TODO: Don't do this? let abs_path = std::env::current_dir().expect("No current directory?");
// If it's stupid but it works... // TODO: don't do this?
// if it's stupid and it works..,
[ [
"assets".to_string(), "assets".to_string(),
"../assets".to_string(), /* optimizations */ "../assets".to_string(), /* optimizations */
@ -105,7 +107,12 @@ fn try_open_with_path(name: &str) -> Option<File> {
[env!("CARGO_MANIFEST_DIR"), "/../../../assets"].concat(), [env!("CARGO_MANIFEST_DIR"), "/../../../assets"].concat(),
] ]
.into_iter() .into_iter()
.map(|bp| [bp, name].concat()) .map(|bp| {
let mut p = abs_path.clone();
p.push(bp);
p.push(name);
p
})
.find_map(|ref filename| File::open(filename).ok()) .find_map(|ref filename| File::open(filename).ok())
} }