3 files changed, 65 insertions, 27 deletions

diff --git a/src/bin/debug.rs b/src/bin/debug.rs
index 9004055..5633387 100644
--- a/src/bin/debug.rs
+++ b/src/bin/debug.rs
@@ -3,10 +3,7 @@ use std::{
     fs::File,
     io::{BufReader, Seek, SeekFrom},
 };
-use unity_tools::{
-    serialized_file::{TypeTreeNode, read_serialized_file},
-    unityfs::UnityFS,
-};
+use unity_tools::{serialized_file::read_serialized_file, unityfs::UnityFS};
 
 fn main() -> anyhow::Result<()> {
     env_logger::init_from_env("LOG");
@@ -34,12 +31,12 @@ fn main() -> anyhow::Result<()> {
                 //     .expect("unknown type")
                 &file.types[ob.type_id as usize]
             };
-            fn print_types(tt: &TypeTreeNode) {
-                println!("{}", tt.type_string);
-                for c in &tt.children {
-                    print_types(&c);
-                }
-            }
+            // fn print_types(tt: &TypeTreeNode) {
+            //     println!("{}", tt.type_string);
+            //     for c in &tt.children {
+            //         print_types(&c);
+            //     }
+            // }
             // fn print_crit_types(tt: &TypeTreeNode) {
             //     let mut crit = tt.byte_size == -1 || tt.children.is_empty();
             //     for c in &tt.children {
@@ -51,9 +48,9 @@ fn main() -> anyhow::Result<()> {
             //     }
             // }
             if let Some(tree) = &typetree.type_tree {
-                // println!("{}", tree.type_string);
+                println!("{}", tree.type_string);
                 // print_crit_types(tree);
-                print_types(tree);
+                // print_types(tree);
             }
             // eprintln!("{typetree:#?}");
 
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!()
         }
     }
 
diff --git a/src/bin/yaml.rs b/src/bin/yaml.rs
new file mode 100644
index 0000000..e541c62
--- /dev/null
+++ b/src/bin/yaml.rs
@@ -0,0 +1,44 @@
+use std::{
+    env::args,
+    fs::File,
+    io::{BufReader, Seek, SeekFrom, stdout},
+};
+use unity_tools::{
+    classes::HValue, 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);
+
+    for node in fs.nodes().to_vec() {
+        if node.name.ends_with(".resource") || node.name.ends_with(".resS") {
+            continue;
+        }
+        let mut cab = fs.read(&node)?;
+        let file = read_serialized_file(&mut cab)?;
+        for ob in file.objects {
+            cab.seek(SeekFrom::Start(ob.data_offset))?;
+            let typetree = if ob.type_id < 0 {
+                unimplemented!()
+            } else {
+                &file.types[ob.type_id as usize]
+            };
+            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)?;
+                let hvalue = HValue::from_value(value)?;
+                serde_yml::to_writer(stdout(), &hvalue).unwrap();
+                println!()
+            }
+        }
+    }
+
+    Ok(())
+}