From 6135cc068a4452542d333e2b55754a61db84b10d Mon Sep 17 00:00:00 2001
From: Omega <github@omega.otherinbox.com>
Date: Wed, 24 Jun 2009 01:29:51 -0400
Subject: [PATCH] fixed some more

---
 disc.py           |  2 ++
 tests/fakesign.py | 20 ++++++++++++--------
 tests/testDISC.py | 13 ++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/disc.py b/disc.py
index 1c50d87..bc81b1e 100644
--- a/disc.py
+++ b/disc.py
@@ -2,6 +2,8 @@ import os, struct, subprocess, fnmatch, shutil, urllib, array
 
 import time
 from title import *
+from Struct import Struct
+
 from common import *
 
 
diff --git a/tests/fakesign.py b/tests/fakesign.py
index 4fa470e..5bebafe 100644
--- a/tests/fakesign.py
+++ b/tests/fakesign.py
@@ -7,14 +7,18 @@ def fakesignPartition(self, iso, index)
 	iso = WOD(iso)
 	iso.openPartition(index)
 	fstBuf = iso.getFst()	"
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'appldr.bin', 'w+b').write(iso.getPartitionApploader()) #saved to cwd/GAMEID/PARTITION/file
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'appldr.bin', 'w+b').close()
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'h3.bin', 'w+b').write(iso.getPartitionH3Table())
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'h3.bin', 'w+b').close()
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'main.dol', 'w+b').write(iso.getPartitionMainDol())
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'main.dol', 'w+b').close()
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'fst.bin', 'w+b').write(fstBuf)
-	open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'fst.bin', 'w+b').close()
+	fn = open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'appldr.bin', 'w+b')
+	fn.write(iso.getPartitionApploader()) #saved to cwd/GAMEID/PARTITION/file
+	fn.close()
+	fn = open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'h3.bin', 'w+b')
+	fn.write(iso.getPartitionH3Table())
+	fn.close()
+	fn = open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'main.dol', 'w+b')
+	fn.write(iso.getPartitionMainDol())
+	fn.close()
+	fn = open(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region + "/" + "PART" + index + "/" + 'fst.bin', 'w+b')
+	fn.write(fstBuf)
+	fn.close()
 	fileNumber = struct.unpack(">I", fstBuf[0x8:0xc])[0]
 	fileObject = iso.fstObject("", iso)
 	iso.parseFst(fstBuf, fstBuf[12 * fileNumber:], 0, fileObject)
diff --git a/tests/testDISC.py b/tests/testDISC.py
index b636b24..8753683 100644
--- a/tests/testDISC.py
+++ b/tests/testDISC.py
@@ -7,24 +7,19 @@ iso = WOD('/enter/other/wii/SUPER_MARIO_GALAXY.iso')
 iso.openPartition(1)
 #print '%s' % iso
 #iso.decryptAll()
-#open('appldr.bin', 'w+b').write(iso.getPartitionApploader())
-#open('appldr.bin', 'w+b').close()
+#open('appldr.bin', 'w+b').write(iso.getPartitionApploader())
 fstBuf = iso.getFst()
-open('fst.bin', 'w+b').write(fstBuf)
-open('fst.bin', 'w+b').close()
+open('fst.bin', 'w+b').write(fstBuf)
 
 fileNumber = struct.unpack(">I", fstBuf[0x8:0xc])[0]
 fileObject = iso.fstObject("", iso)
 iso.parseFst(fstBuf, fstBuf[12 * fileNumber:], 0, fileObject)
 print fileObject.getList()
 fileObject.write(os.getcwd() + "/" + iso.discHdr.discId + iso.discHdr.gameCode + iso.discHdr.region)
-fileObject.close()
 
-#open('h3.bin', 'w+b').write(iso.getPartitionH3Table())
-#open('h3.bin', 'w+b').close()
+#open('h3.bin', 'w+b').write(iso.getPartitionH3Table())
 #isoTik = Ticket('tik.bin')
 #print '%s' % isoTik
-#open('main.dol', 'w+b').write(iso.getPartitionMainDol())
-#open('main.dol', 'w+b').close()
+#open('main.dol', 'w+b').write(iso.getPartitionMainDol())
 #isoTmd = TMD(iso.getPartitionTmd())
 #print isoTmd