robin/tf-asset-loader
1
0
Fork 0
mirror of https://codeberg.org/icewind/tf-asset-loader.git synced 2026-06-03 16:44:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix feature gate

Browse source
This commit is contained in:
Robin Appelman 2023-12-20 17:14:52 +01:00
commit 714ccd70f7
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/lib.rs
View file

@ -2,10 +2,11 @@ pub mod source;
pub use source::AssetSource; pub use source::AssetSource;
use std::env::var_os; use std::env::var_os;
use std::fmt::Debug; use std::fmt::{Debug, Formatter};
use std::path::PathBuf; use std::path::PathBuf;
use steamlocate::SteamDir; use steamlocate::SteamDir;
use thiserror::Error; use thiserror::Error;
use tracing::warn;
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum LoaderError { pub enum LoaderError {
@ -24,6 +25,14 @@ pub struct Loader {
sources: Vec<Box<dyn AssetSource>>, sources: Vec<Box<dyn AssetSource>>,
} }
impl Debug for Loader {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Loader")
.field("sources", &self.sources.len())
.finish_non_exhaustive()
}
}
impl Loader { impl Loader {
/// Create the loader /// Create the loader
pub fn new() -> Result<Self, LoaderError> { pub fn new() -> Result<Self, LoaderError> {
@ -33,7 +42,7 @@ impl Loader {
let hl_dir = tf2_dir.join("hl2"); let hl_dir = tf2_dir.join("hl2");
let download = tf_dir.join("download"); let download = tf_dir.join("download");
#[cfg(feature = "bsp")] #[cfg(feature = "vpk")]
let vpks = tf_dir let vpks = tf_dir
.read_dir()? .read_dir()?
.chain(hl_dir.read_dir()?) .chain(hl_dir.read_dir()?)
@ -41,7 +50,12 @@ impl Loader {
.filter_map(|item| Some(item.path().to_str()?.to_string())) .filter_map(|item| Some(item.path().to_str()?.to_string()))
.filter(|path| path.ends_with("dir.vpk")) .filter(|path| path.ends_with("dir.vpk"))
.map(|path| vpk::from_path(&path)) .map(|path| vpk::from_path(&path))
.filter_map(|res| res.ok()) .filter_map(|res| {
if let Err(e) = &res {
warn!(error = ?e, "error while loading vpk");
}
res.ok()
})
.map(|vpk| Box::new(vpk) as Box<dyn AssetSource>); .map(|vpk| Box::new(vpk) as Box<dyn AssetSource>);
#[allow(unused_mut)] #[allow(unused_mut)]
@ -51,7 +65,7 @@ impl Loader {
Box::new(hl_dir), Box::new(hl_dir),
]; ];
#[cfg(feature = "bsp")] #[cfg(feature = "vpk")]
sources.extend(vpks); sources.extend(vpks);
Ok(Loader { sources }) Ok(Loader { sources })