more inspection tools

1 files changed, 12 insertions, 15 deletions

diff --git a/src/bin/json.rs b/src/bin/json.rs
index 3155b02..4611530 100644
--- a/src/bin/json.rs
+++ b/src/bin/json.rs
@@ -1,19 +1,16 @@
 use std::{
-    env::args,
+    env::{args, var},
     fs::File,
     io::{BufReader, Seek, SeekFrom, stdout},
 };
-use unity_tools::{
-    object::{Value, read_value},
-    serialized_file::read_serialized_file,
-    unityfs::UnityFS,
-};
+use unity_tools::{object::read_value, serialized_file::read_serialized_file, unityfs::UnityFS};
 
 fn main() -> anyhow::Result<()> {
     env_logger::init_from_env("LOG");
     let file = BufReader::new(File::open(args().nth(1).unwrap())?);
     let mut fs = UnityFS::open(file)?;
     let filter = args().nth(2);
+    let pretty = var("PRETTY").is_ok();
 
     for node in fs.nodes().to_vec() {
         if node.name.ends_with(".resource") || node.name.ends_with(".resS") {
@@ -21,8 +18,6 @@ fn main() -> anyhow::Result<()> {
         }
         let mut cab = fs.read(&node)?;
         let file = read_serialized_file(&mut cab)?;
-        let e = file.endianness;
-
         for ob in file.objects {
             cab.seek(SeekFrom::Start(ob.data_offset))?;
             let typetree = if ob.type_id < 0 {
@@ -30,18 +25,20 @@ fn main() -> anyhow::Result<()> {
             } else {
                 &file.types[ob.type_id as usize]
             };
-            let value = read_value(typetree.type_tree.as_ref().unwrap(), e, &mut cab)?;
-            if let Some(f) = &filter {
-                if let Value::Object { class, .. } = &value {
-                    if class != f {
+            if let Some(typetree) = &typetree.type_tree {
+                if let Some(f) = &filter {
+                    if typetree.type_string != *f && ob.path_id.to_string() != *f {
                         continue;
                     }
+                }
+                let value = read_value(typetree, file.endianness, &mut cab)?;
+                if pretty {
+                    serde_json::to_writer_pretty(stdout(), &value.to_json()).unwrap();
                 } else {
-                    continue;
+                    serde_json::to_writer(stdout(), &value.to_json()).unwrap();
                 }
+                println!()
             }
-            serde_json::to_writer(stdout(), &value.to_json()).unwrap();
-            println!()
         }
     }