assetbundle struct to abstract over unityfs and serializedfile

1 files changed, 5 insertions, 31 deletions

diff --git a/exporter/src/bin/material_stats.rs b/exporter/src/bin/material_stats.rs
index 3eb4dc0..b853442 100644
--- a/exporter/src/bin/material_stats.rs
+++ b/exporter/src/bin/material_stats.rs
@@ -1,48 +1,22 @@
-use anyhow::anyhow;
 use std::{env::args, fs::File, io::BufReader};
-use unity_tools::{classes::material::Material, serialized_file::SerializedFile, unityfs::UnityFS};
+use unity_tools::{assetbundle::AssetBundle, classes::material::Material};
 
 fn main() -> anyhow::Result<()> {
     env_logger::init_from_env("LOG");
     let file = BufReader::new(File::open(args().nth(1).unwrap()).unwrap());
-    let fs = UnityFS::open(file)?;
+    let mut bundle = AssetBundle::open(file)?;
 
     let mode = args().nth(2).unwrap();
 
-    let cabfile = fs
-        .find_main_file()
-        .ok_or(anyhow!("no CAB file found"))?
-        .to_owned();
-
-    let cab = fs.read(&cabfile)?;
-    let mut file = SerializedFile::read(cab)?;
-    let mut sharedassets = file
-        .find_fs_shared_assets(&fs)
-        .map(|n| {
-            let f = fs.read(&n)?;
-            let f = SerializedFile::read(f)?;
-            Ok::<_, anyhow::Error>(f)
-        })
-        .transpose()?;
-
-    for ob in file.objects.clone() {
-        if file.get_object_type_tree(&ob)?.type_string != "Material" {
-            continue;
-        }
-        let mat = file.read_object(ob)?.parse::<Material>()?;
+    for ob in bundle.all_toplevel_of_class("Material").collect::<Vec<_>>() {
+        let mat = ob.load(&mut bundle)?.parse::<Material>()?;
 
         match mode.as_str() {
             "material" => {
                 println!("{}", mat.name)
             }
             "shader" => {
-                println!(
-                    "{}",
-                    mat.shader
-                        .load(&mut file, sharedassets.as_mut())?
-                        .parsed
-                        .name
-                )
+                println!("{}", mat.shader.load(&mut bundle)?.parsed.name)
             }
             x => panic!("unknown mode {x:?}"),
         }