From ba1e142f7e5f8d6c41e3a1f0d28f69c491830869 Mon Sep 17 00:00:00 2001 From: Omega Date: Wed, 24 Jun 2009 00:55:41 -0400 Subject: [PATCH] fixing disc.py and testDISC.py --- disc.py | 2 -- tests/testDISC.py | 13 +++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/disc.py b/disc.py index bc81b1e..1c50d87 100644 --- a/disc.py +++ b/disc.py @@ -2,8 +2,6 @@ import os, struct, subprocess, fnmatch, shutil, urllib, array import time from title import * -from Struct import Struct - from common import * diff --git a/tests/testDISC.py b/tests/testDISC.py index 8753683..b636b24 100644 --- a/tests/testDISC.py +++ b/tests/testDISC.py @@ -7,19 +7,24 @@ 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').write(iso.getPartitionApploader()) +#open('appldr.bin', 'w+b').close() fstBuf = iso.getFst() -open('fst.bin', 'w+b').write(fstBuf) +open('fst.bin', 'w+b').write(fstBuf) +open('fst.bin', 'w+b').close() 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').write(iso.getPartitionH3Table()) +#open('h3.bin', 'w+b').close() #isoTik = Ticket('tik.bin') #print '%s' % isoTik -#open('main.dol', 'w+b').write(iso.getPartitionMainDol()) +#open('main.dol', 'w+b').write(iso.getPartitionMainDol()) +#open('main.dol', 'w+b').close() #isoTmd = TMD(iso.getPartitionTmd()) #print isoTmd