NinjaCheetah/WiiPy
1
0
Fork 0
mirror of https://github.com/NinjaCheetah/WiiPy.git synced 2025-04-26 21:31:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with content ordering when packing/unpacking

Browse Source
This commit is contained in:
Campbell 2024-10-24 14:32:48 -04:00
parent af9b639a6b
commit 2342657e70
Signed by: NinjaCheetah
GPG Key ID: 670C282B3291D63D
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/title/wad.py
View File

@ -109,10 +109,6 @@ def handle_wad_pack(args):
content_files = list(input_path.glob("*.[aA][pP][pP]")) content_files = list(input_path.glob("*.[aA][pP][pP]"))
if not content_files: if not content_files:
raise FileNotFoundError("No contents found! Cannot pack WAD.") raise FileNotFoundError("No contents found! Cannot pack WAD.")
# Semi-hacky sorting method, but it works. Should maybe be changed eventually.
content_files_ordered = []
for index in range(len(content_files)):
content_files_ordered.append(pathlib.Path(content_files[index]))
# Open the output file, and load all the component files that we've now verified we have into a libWiiPy Title() # Open the output file, and load all the component files that we've now verified we have into a libWiiPy Title()
# object. # object.
@ -127,6 +123,16 @@ def handle_wad_pack(args):
title.wad.set_meta_data(footer_file.read_bytes()) title.wad.set_meta_data(footer_file.read_bytes())
# Method to ensure that the title's content records match between the TMD() and ContentRegion() objects. # Method to ensure that the title's content records match between the TMD() and ContentRegion() objects.
title.load_content_records() title.load_content_records()
# Sort the contents based on the records. May still be kinda hacky.
content_indices = []
for record in title.content.content_records:
content_indices.append(record.index)
content_files_ordered = []
for _ in content_files:
content_files_ordered.append(None)
for index in range(len(content_files)):
target_index = content_indices.index(int(content_files[index].stem, 16))
content_files_ordered[target_index] = content_files[index]
# Iterate over every file in the content_files list, and set them in the Title(). # Iterate over every file in the content_files list, and set them in the Title().
for index in range(title.content.num_contents): for index in range(title.content.num_contents):
dec_content = content_files_ordered[index].read_bytes() dec_content = content_files_ordered[index].read_bytes()
@ -288,7 +294,8 @@ def handle_wad_unpack(args):
skip_hash = False skip_hash = False
for content_file in range(0, title.tmd.num_contents): for content_file in range(0, title.tmd.num_contents):
content_file_name = f"{content_file:08X}".lower() + ".app" content_index = title.content.content_records[content_file].index
content_file_name = f"{content_index:08X}".lower() + ".app"
output_path.joinpath(content_file_name).write_bytes(title.get_content_by_index(content_file, skip_hash)) output_path.joinpath(content_file_name).write_bytes(title.get_content_by_index(content_file, skip_hash))
print("WAD file unpacked!") print("WAD file unpacked!")

4
wiipy.py
View File

@ -106,7 +106,7 @@ if __name__ == "__main__":
# Argument parser for the iospatch command. # Argument parser for the iospatch command.
iospatch_parser = subparsers.add_parser("iospatch", help="patch IOS WADs to re-enable exploits", iospatch_parser = subparsers.add_parser("iospatch", help="patch IOS WADs to re-enable exploits",
description="patch IOS WADs to re-enable exploits; by default, this will" description="patch IOS WADs to re-enable exploits; by default, this will "
"overwrite the input file in place unless you use -o/--output") "overwrite the input file in place unless you use -o/--output")
iospatch_parser.set_defaults(func=handle_iospatch) iospatch_parser.set_defaults(func=handle_iospatch)
iospatch_parser.add_argument("input", metavar="IN", type=str, help="input file") iospatch_parser.add_argument("input", metavar="IN", type=str, help="input file")
@ -117,7 +117,7 @@ if __name__ == "__main__":
iospatch_parser.add_argument("-vd", "--version-downgrading", action="store_true", iospatch_parser.add_argument("-vd", "--version-downgrading", action="store_true",
help="patch in version downgrading support") help="patch in version downgrading support")
iospatch_parser.add_argument("-di", "--drive-inquiry", action="store_true", iospatch_parser.add_argument("-di", "--drive-inquiry", action="store_true",
help="patches out the drive inquiry check") help="patches out the drive inquiry (EXPERIMENTAL)")
iospatch_parser.add_argument("-v", "--version", metavar="VERSION", type=int, help="set the IOS version") iospatch_parser.add_argument("-v", "--version", metavar="VERSION", type=int, help="set the IOS version")
iospatch_parser.add_argument("-s", "--slot", metavar="SLOT", type=int, iospatch_parser.add_argument("-s", "--slot", metavar="SLOT", type=int,
help="set the slot that this IOS will install to") help="set the slot that this IOS will install to")