From 66e83ff3f85593d63c1e6b824c3002974fe5c5ee Mon Sep 17 00:00:00 2001
From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:14:20 -0500
Subject: [PATCH] Minor changes to wad.py that allow for testing

---
 .gitignore          |  3 ++-
 src/libWiiPy/tmd.py |  1 +
 src/libWiiPy/wad.py | 33 ++++++++++++++++++---------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c2ceec..62b9984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,4 +162,5 @@ cython_debug/
 .idea/
 
 # Allows me to keep TMD files in my repository folder for testing without accidentally publishing them
-*.tmd
\ No newline at end of file
+*.tmd
+*.wad
\ No newline at end of file
diff --git a/src/libWiiPy/tmd.py b/src/libWiiPy/tmd.py
index fc3e22c..69fee9a 100644
--- a/src/libWiiPy/tmd.py
+++ b/src/libWiiPy/tmd.py
@@ -1,4 +1,5 @@
 # "tmd.py" from libWiiPy by NinjaCheetah
+#
 # See https://wiibrew.org/wiki/Title_metadata for details about the TMD format
 
 import binascii
diff --git a/src/libWiiPy/wad.py b/src/libWiiPy/wad.py
index 2df6629..3dfcc07 100644
--- a/src/libWiiPy/wad.py
+++ b/src/libWiiPy/wad.py
@@ -20,10 +20,10 @@ class ContentRecord:
 
 class wadHeader:
     """Break down 32 byte WAD header."""
-    def __init__(self, wadhdr):
-        self.wadhdr = wadhdr
+    def __init__(self, wad):
+        self.wad = wad
         self.wad_hdr_size: int
-        self.wad_type: int
+        self.wad_type: str
         self.wad_version: int
         # Sizes
         self.wad_cert_size: int
@@ -50,7 +50,7 @@ class wadHeader:
             self.wad_hdr_size = wadfile.read(4)
             # WAD type
             wadfile.seek(0x04)
-            self.wad_type = wadfile.read(2)
+            self.wad_type = str(wadfile.read(2).decode())
             # WAD version
             wadfile.seek(0x06)
             self.wad_version = wadfile.read(2)
@@ -75,28 +75,31 @@ class wadHeader:
             #====================================================================================
             # Calculate file offsets from sizes
             #====================================================================================
-            self.wad_cert_offset + self.wad_hdr_size
+            self.wad_cert_offset = self.wad_hdr_size
             # I've never seen crl used (don't even know what it's for) but still calculating in case...
-            self.wad_crl_offset + self.wad_cert_offset + self.wad_cert_size
-            self.wad_tik_offset + self.wad_crl_offset + self.wad_crl_size
-            self.wad_tmd_offset + self.wad_tik_offset + self.wad_tik_size
-            self.wad_app_offset + self.wad_tmd_offset + self.wad_tmd_size
+            self.wad_crl_offset = self.wad_cert_offset + self.wad_cert_size
+            self.wad_tik_offset = self.wad_crl_offset + self.wad_crl_size
+            self.wad_tmd_offset = self.wad_tik_offset + self.wad_tik_size
+            self.wad_app_offset = self.wad_tmd_offset + self.wad_tmd_size
             # Same with meta. If private Nintendo tools calculate these then maaaaaybe we should too.
-            self.wad_meta_offset + self.wad_app_offset + self.wad_app_size
+            self.wad_meta_offset = self.wad_app_offset + self.wad_app_size
 
     def get_cert_region(self):
-        """Returns the offset and size for the cert"""
+        """Returns the offset and size for the cert."""
         return self.wad_cert_offset, self.wad_cert_size
 
     def get_ticket_region(self):
-        """Returns the offset and size for the ticket"""
+        """Returns the offset and size for the ticket."""
         return self.wad_tik_offset, self.wad_tik_size
 
     def get_tmd_region(self):
-        """Returns the offset and size for the TMD"""
+        """Returns the offset and size for the TMD."""
         return self.wad_tmd_offset, self.wad_tmd_size
 
     def get_app_region(self):
-        """Returns the offset and size for the app"""
+        """Returns the offset and size for the app."""
         return self.wad_app_offset, self.wad_tmd_size
-      
+
+    def get_wad_type(self):
+        """Returns the type of the WAD. This is 'Is' unless the WAD contains boot2 where it is 'ib'."""
+        return self.wad_type