read object abstraction

1 files changed, 14 insertions, 22 deletions

diff --git a/src/bin/json.rs b/src/bin/json.rs
index 2d09306..dd83de6 100644
--- a/src/bin/json.rs
+++ b/src/bin/json.rs
@@ -1,9 +1,9 @@
 use std::{
     env::{args, var},
     fs::File,
-    io::{BufReader, Seek, SeekFrom, stdout},
+    io::{BufReader, stdout},
 };
-use unity_tools::{object::read::read_value, serialized_file::SerializedFile, unityfs::UnityFS};
+use unity_tools::{serialized_file::SerializedFile, unityfs::UnityFS};
 
 fn main() -> anyhow::Result<()> {
     env_logger::init_from_env("LOG");
@@ -14,28 +14,20 @@ fn main() -> anyhow::Result<()> {
 
     let node = fs.find_main_file().unwrap().to_owned();
     let mut cab = fs.read(&node)?;
-    let file = SerializedFile::read(&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)?;
-            if pretty {
-                serde_json::to_writer_pretty(stdout(), &value.to_json()).unwrap();
-            } else {
-                serde_json::to_writer(stdout(), &value.to_json()).unwrap();
+    let mut file = SerializedFile::read(&mut cab)?;
+    for ob in file.objects.clone() {
+        if let Some(f) = &filter {
+            if file.get_object_type_tree(&ob)?.type_string != *f && ob.path_id.to_string() != *f {
+                continue;
             }
-            println!()
         }
+        let value = file.read_object(ob)?;
+        if pretty {
+            serde_json::to_writer_pretty(stdout(), &value.to_json()).unwrap();
+        } else {
+            serde_json::to_writer(stdout(), &value.to_json()).unwrap();
+        }
+        println!()
     }
 
     Ok(())