From ed6ed7a62217369544f3e31ef9a886f459f0c21b Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 15 Mar 2025 21:31:40 +0100 Subject: assetbundle struct to abstract over unityfs and serializedfile --- src/assetbundle.rs | 56 ++++++++++++++++++++++++++++++++++++++++++++ src/classes/pptr.rs | 19 +++++++-------- src/classes/streaminginfo.rs | 2 +- src/lib.rs | 1 + src/scene/mod.rs | 1 - src/serialized_file.rs | 7 ++++++ 6 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 src/assetbundle.rs delete mode 100644 src/scene/mod.rs (limited to 'src') diff --git a/src/assetbundle.rs b/src/assetbundle.rs new file mode 100644 index 0000000..e10a8f3 --- /dev/null +++ b/src/assetbundle.rs @@ -0,0 +1,56 @@ +use crate::{ + classes::pptr::PPtr, + serialized_file::SerializedFile, + unityfs::{NodeReader, UnityFS, block_reader::BlockReader, multi_reader::MultiReader}, +}; +use anyhow::{Context, Result, anyhow}; +use std::{ + io::{Read, Seek}, + marker::PhantomData, +}; + +/// High-level wrapper around UnityFS, SerializedFile and all the classes. +pub struct AssetBundle { + pub fs: UnityFS, + pub(crate) main: SerializedFile>>>, + pub(crate) shared_assets: Option>>>>, +} + +impl AssetBundle { + pub fn open(inner: T) -> Result { + let fs = UnityFS::open(inner).context("opening UnityFS")?; + let main_ni = fs + .find_main_file() + .ok_or(anyhow!("AssetBundle seems to lack main file"))?; + let main = SerializedFile::read(fs.read(main_ni)?)?; + let shared_assets = if let Some(n) = main.find_fs_shared_assets(&fs) { + Some(SerializedFile::read(fs.read(&n)?)?) + } else { + None + }; + Ok(Self { + fs, + main, + shared_assets, + }) + } + + pub fn all_toplevel_of_class(&self, class_name: &str) -> impl Iterator { + self.main + .all_objects_of_class(class_name) + .map(|o| (0, o)) + .chain( + self.shared_assets + .as_ref() + .map(|e| e.all_objects_of_class(class_name).map(|o| (1, o))) + .into_iter() + .flatten(), + ) + .map(|(fi, o)| PPtr { + class: class_name.to_owned(), + file_id: fi, + path_id: o.path_id, + _class: PhantomData, + }) + } +} diff --git a/src/classes/pptr.rs b/src/classes/pptr.rs index 9b54cbb..366e17c 100644 --- a/src/classes/pptr.rs +++ b/src/classes/pptr.rs @@ -1,6 +1,6 @@ use crate::{ + assetbundle::AssetBundle, object::{Value, parser::FromValue}, - serialized_file::SerializedFile, }; use anyhow::{Result, anyhow, bail}; use log::debug; @@ -13,7 +13,7 @@ use std::{ #[derive(Debug, Serialize)] pub struct PPtr { #[serde(skip, default)] - _class: PhantomData, + pub(crate) _class: PhantomData, pub class: String, pub file_id: i32, pub path_id: i64, @@ -54,27 +54,26 @@ impl PPtr { pub fn is_null(&self) -> bool { self.path_id == 0 && self.file_id == 0 } - pub fn load( - &self, - file: &mut SerializedFile, - shared_assets: Option<&mut SerializedFile>, - ) -> Result { + pub fn load(&self, bundle: &mut AssetBundle) -> Result { debug!( "loading PPtr<{}> file_id={} path_id={}", self.class, self.file_id, self.path_id ); match self.file_id { 0 => { - let ob = file + let ob = bundle + .main .objects .iter() .find(|o| o.path_id == self.path_id) .ok_or(anyhow!("object with path id {} not found", self.path_id))? .to_owned(); - file.read_object(ob)?.parse() + bundle.main.read_object(ob)?.parse() } 1 => { - let file = shared_assets.unwrap(); + let file = bundle.shared_assets.as_mut().ok_or(anyhow!( + "shared assets referenced but not included in bundle" + ))?; let ob = file .objects .iter() diff --git a/src/classes/streaminginfo.rs b/src/classes/streaminginfo.rs index 21029f4..e308f1c 100644 --- a/src/classes/streaminginfo.rs +++ b/src/classes/streaminginfo.rs @@ -26,7 +26,7 @@ impl FromValue for StreamingInfo { } impl StreamingInfo { - pub fn read(&self, fs: &mut UnityFS) -> Result> { + pub fn read(&self, fs: &UnityFS) -> Result> { if !self.path.starts_with("archive:") { bail!("StreamingInfo path does not start on archive:") } diff --git a/src/lib.rs b/src/lib.rs index f01eaae..68e80f4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,3 +5,4 @@ pub mod helper; pub mod object; pub mod serialized_file; pub mod unityfs; +pub mod assetbundle; diff --git a/src/scene/mod.rs b/src/scene/mod.rs deleted file mode 100644 index 8b13789..0000000 --- a/src/scene/mod.rs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/serialized_file.rs b/src/serialized_file.rs index a6514ee..aba72b9 100644 --- a/src/serialized_file.rs +++ b/src/serialized_file.rs @@ -345,6 +345,13 @@ impl SerializedFile { .ok_or(anyhow!("type tree missing"))?; Value::read(typetree, self.endianness, &mut self.file) } + + pub fn all_objects_of_class(&self, class_name: &str) -> impl Iterator { + self.objects.iter().filter(move |o| { + self.get_object_type_tree(&o) + .map_or(false, |t| t.type_string == class_name) + }) + } } impl TypeTreeNode { -- cgit v1.2.3-70-g09d2