Minor README updates in preparation for WiiPy v1.3.0

Info command now displays more info for TMDs, as well as info for Tickets or entire WADs.
EmuNAND command now allows for bulk installing a folder of WADs, and will create/update uid.sys during installation.

.github/workflows/python-build.yaml

@@ -31,10 +31,10 @@ jobs:
         pip install -r requirements.txt
     - name: Build Application
       run: |
-        python -m nuitka --show-progress --assume-yes-for-downloads --onefile wiipy.py
+        python -m nuitka --show-progress --assume-yes-for-downloads --onefile wiipy.py -o wiipy
     - name: Prepare Package for Upload
       run: |
-        mv wiipy.bin ~/wiipy
+        mv wiipy ~/wiipy
         cd ~
         tar cvf WiiPy.tar wiipy
     - name: Upload Application
@@ -59,10 +59,10 @@ jobs:
           pip install -r requirements.txt
       - name: Build Application
         run: |
-          python -m nuitka --show-progress --assume-yes-for-downloads --onefile wiipy.py
+          python -m nuitka --show-progress --assume-yes-for-downloads --onefile wiipy.py -o wiipy
       - name: Prepare Package for Upload
         run: |
-          mv wiipy.bin ~/wiipy
+          mv wiipy ~/wiipy
           cd ~
           tar cvf WiiPy.tar wiipy
       - name: Upload Application

.gitignore

@@ -25,6 +25,7 @@ share/python-wheels/
 *.build/
 *.dist/
 *.onefile-build/
+wiipy
 .installed.cfg
 *.egg
 MANIFEST
@@ -165,6 +166,9 @@ cython_debug/
 
 # Allows me to keep TMD files in my repository folder for testing without accidentally publishing them
 *.tmd
+*.tik
+*.cert
+*.footer
 *.wad
 *.app
 *.arc

Makefile

@@ -0,0 +1,13 @@
+CC=python -m nuitka
+
+linux:
+	$(CC) --show-progress --assume-yes-for-downloads --onefile wiipy.py -o wiipy
+
+linux-install:
+	install wiipy /usr/bin/
+
+clean:
+	rm wiipy
+	rm -rd wiipy.build
+	rm -rd wiipy.dist
+	rm -rd wiipy.onefile-build

README.md

@@ -5,22 +5,25 @@ WiiPy is cross-platform, and supports macOS, Windows, and Linux, both because it
 
 To see what features are supported, I would recommend checking out the list of features that libWiiPy offers, which can be found [here]("https://github.com/NinjaCheetah/libWiiPy?tab=readme-ov-file#features").
 
+
 ## Requirements
-libWiiPy has been tested on both Python 3.11 and 3.12, and works as expected in both places. libWiiPy *should* support Python 3.10, however this is not verified. WiiPy only relies on libWiiPy, so it supports the same Python versions.
+libWiiPy has been tested on both Python 3.11 and 3.12, and works as expected in both places. WiiPy relies only on libWiiPy, so generally any version supported by libWiiPy should be supported by WiiPy.
 
 To make sure you have libWiiPy and all of its dependencies, you can simply run:
 ```shell
 pip install -r requirements.txt
 ```
 
+
 ## Usage
 Basic usage for WiiPy is very simple.
 ```shell
 python3 wiipy.py <subcommand>
 ```
-You can use `--help` to see a list of all subcommands, or use `<subcommand> --help` to see usage instructions for that subcommand.
+You can use `--help` to see a list of all commands, or use `<command> --help` to see usage instructions for that command. This also applies to subcommands, with the syntax `<command> <subcommand> --help`.
+
+Available subcommands will expand as support for more features are added into libWiiPy. WiiPy is designed around libWiiPy's `main` branch, so any features that have been merged into main are likely to be supported here within a short period of time. This also means that any updates to the library will be addressed here quickly, so breaking changes in libWiiPy shouldn't cause issues.
 
-Available subcommands will expand as support for more features are added into libWiiPy. WiiPy is designed around libWiiPy's `main` branch, so any features that have been merged into main are likely to be supported here within a short period of time. This also means that any breaking changes to the library will be handled here quickly, so incompatibilities shouldn't happen.
 
 ## Compiling
 If you'd like to compile WiiPy from Python into something a little more native, you can use one of the following commands. Make sure you've installed Nuitka first (it's included in `requirements.txt`).
@@ -28,3 +31,19 @@ If you'd like to compile WiiPy from Python into something a little more native,
 python -m nuitka --show-progress --assume-yes-for-downloads --onefile wiipy.py
 ```
 On macOS and Linux, this will give you a binary named `wiipy.bin` in the same directory as the Python file. On Windows, you'll get a binary named `wiipy.exe` instead.
+
+### For Linux Users:
+A Makefile has been included to both build and install WiiPy on Linux. This will install `wiipy` to `/usr/bin/`.
+
+First, use make to build WiiPy (this automates the step above):
+```shell
+make linux
+```
+
+Then, run the install command with `sudo` (or your favorite alternative):
+```shell
+sudo make linux-install
+```
+
+### A Note About Scripts
+WiiPy's source includes a directory named `scripts`, which is currently where miscellaneous libWiiPy-based scripts live. Note that they are not part of WiiPy releases, and are not tested the same way the WiiPy is. They are simply here for those who may find them useful.

modules/archive/ash.py

@@ -1,4 +1,4 @@
-# "ash.py" from WiiPy by NinjaCheetah
+# "modules/archive/ash.py" from WiiPy by NinjaCheetah
 # https://github.com/NinjaCheetah/WiiPy
 
 import pathlib

modules/archive/u8.py

@@ -1,4 +1,4 @@
-# "u8.py" from WiiPy by NinjaCheetah
+# "modules/archive/u8.py" from WiiPy by NinjaCheetah
 # https://github.com/NinjaCheetah/WiiPy
 
 import pathlib

modules/title/emunand.py

@@ -0,0 +1,57 @@
+# "modules/title/emunand.py" from WiiPy by NinjaCheetah
+# https://github.com/NinjaCheetah/WiiPy
+
+import pathlib
+import libWiiPy
+
+
+def handle_emunand_title(args):
+    emunand = libWiiPy.title.EmuNAND(args.emunand)
+    if args.skip_hash:
+        skip_hash = True
+    else:
+        skip_hash = False
+
+    # Code for if the --install argument was passed.
+    if args.install:
+        input_path = pathlib.Path(args.install)
+
+        if not input_path.exists():
+            raise FileNotFoundError(input_path)
+
+        if input_path.is_dir():
+            wad_files = list(input_path.glob("*.[wW][aA][dD]"))
+            if not wad_files:
+                raise FileNotFoundError("No WAD files were found in the provided input directory!")
+            wad_count = 0
+            for wad in wad_files:
+                title = libWiiPy.title.Title()
+                title.load_wad(open(wad, "rb").read())
+                try:
+                    emunand.install_title(title, skip_hash=skip_hash)
+                    wad_count += 1
+                except ValueError:
+                    print(f"WAD {wad} could not be installed!")
+            print(f"Successfully installed {wad_count} WAD(s) to EmuNAND!")
+        else:
+            title = libWiiPy.title.Title()
+            title.load_wad(open(input_path, "rb").read())
+            emunand.install_title(title, skip_hash=skip_hash)
+            print("Successfully installed WAD to EmuNAND!")
+
+    # Code for if the --uninstall argument was passed.
+    elif args.uninstall:
+        input_str = args.uninstall
+        if pathlib.Path(input_str).exists():
+            title = libWiiPy.title.Title()
+            title.load_wad(open(pathlib.Path(input_str), "rb").read())
+            target_tid = title.tmd.title_id
+        else:
+            target_tid = args.install
+
+        if len(target_tid) != 16:
+            raise ValueError("Invalid Title ID! Title IDs must be 16 characters long.")
+
+        emunand.uninstall_title(target_tid)
+
+        print("Title uninstalled from EmuNAND!")

modules/title/fakesign.py

@@ -0,0 +1,37 @@
+# "modules/title/fakesign.py" from WiiPy by NinjaCheetah
+# https://github.com/NinjaCheetah/WiiPy
+
+import pathlib
+import libWiiPy
+
+
+def handle_fakesign(args):
+    input_path = pathlib.Path(args.input)
+    if args.output is not None:
+        output_path = pathlib.Path(args.output)
+    else:
+        output_path = pathlib.Path(args.input)
+
+    if not input_path.exists():
+        raise FileNotFoundError(input_path)
+
+    if input_path.suffix.lower() == ".tmd":
+        tmd = libWiiPy.title.TMD()
+        tmd.load(open(input_path, "rb").read())
+        tmd.fakesign()
+        open(output_path, "wb").write(tmd.dump())
+        print("TMD fakesigned successfully!")
+    elif input_path.suffix.lower() == ".tik":
+        tik = libWiiPy.title.Ticket()
+        tik.load(open(input_path, "rb").read())
+        tik.fakesign()
+        open(output_path, "wb").write(tik.dump())
+        print("Ticket fakesigned successfully!")
+    elif input_path.suffix.lower() == ".wad":
+        title = libWiiPy.title.Title()
+        title.load_wad(open(input_path, "rb").read())
+        title.fakesign()
+        open(output_path, "wb").write(title.dump_wad())
+        print("WAD fakesigned successfully!")
+    else:
+        raise TypeError("This does not appear to be a TMD, Ticket, or WAD! Cannot fakesign.")

modules/title/info.py

@@ -0,0 +1,119 @@
+# "modules/title/info.py" from WiiPy by NinjaCheetah
+# https://github.com/NinjaCheetah/WiiPy
+
+import pathlib
+import binascii
+import libWiiPy
+
+
+def _print_tmd_info(tmd: libWiiPy.title.TMD):
+    # Get all important keys from the TMD and print them out nicely.
+    print("Title Info")
+    print(f"  Title ID: {tmd.title_id}")
+    # This type of version number really only applies to the System Menu and IOS.
+    if tmd.title_id[:8] == "00000001":
+        print(f"  Title Version: {tmd.title_version} ({tmd.title_version_converted})")
+    else:
+        print(f"  Title Version: {tmd.title_version}")
+    print(f"  TMD Version: {tmd.tmd_version}")
+    # IOSes just have an all-zero TID, so don't bothering showing that.
+    if tmd.ios_tid == "0000000000000000":
+        print(f"  IOS Version: N/A")
+    else:
+        print(f"  Required IOS: IOS{int(tmd.ios_tid[-2:], 16)} ({tmd.ios_tid})")
+    if tmd.issuer.decode().find("CP00000004") != 1:
+        print(f"  Certificate: CP00000004 (Retail)")
+        print(f"  Certificate Issuer: Root-CA00000001")
+    elif tmd.issuer.decode().find("CP00000007") != 1:
+        print(f"  Certificate: CP00000007 (Development)")
+        print(f"  Certificate Issuer: Root-CA00000002")
+    elif tmd.issuer.decode().find("CP10000000") != 1:
+        print(f"  Certificate: CP10000000 (Arcade)")
+        print(f"  Certificate Issuer: Root-CA10000000")
+    print(f"  Region: {tmd.get_title_region()}")
+    print(f"  Title Type: {tmd.get_title_type()}")
+    print(f"  vWii Title: {bool(tmd.vwii)}")
+    print(f"  DVD Video Access: {tmd.get_access_right(tmd.AccessFlags.DVD_VIDEO)}")
+    print(f"  AHB Access: {tmd.get_access_right(tmd.AccessFlags.AHB)}")
+    print(f"  Fakesigned: {tmd.get_is_fakesigned()}")
+    # Iterate over the content and print their details.
+    print("\nContent Info")
+    print(f"Total Contents: {tmd.num_contents}")
+    for content in tmd.content_records:
+        print(f"  Content Index: {content.index}")
+        print(f"    Content ID: " + f"{content.content_id:08X}".lower())
+        print(f"    Content Type: {tmd.get_content_type(content.index)}")
+        print(f"    Content Size: {content.content_size} bytes")
+        print(f"    Content Hash: {content.content_hash.decode()}")
+
+
+def _print_ticket_info(ticket: libWiiPy.title.Ticket):
+    # Get all important keys from the TMD and print them out nicely.
+    print(f"Ticket Info")
+    print(f"  Title ID: {ticket.title_id.decode()}")
+    # This type of version number really only applies to the System Menu and IOS.
+    if ticket.title_id.decode()[:8] == "00000001":
+        print(f"  Title Version: {ticket.title_version} "
+              f"({libWiiPy.title.title_ver_dec_to_standard(ticket.title_version, ticket.title_id.decode())})")
+    else:
+        print(f"  Title Version: {ticket.title_version}")
+    print(f"  Ticket Version: {ticket.ticket_version}")
+    if ticket.signature_issuer.find("XS00000003") != 1:
+        print(f"  Certificate: XS00000003 (Retail)")
+        print(f"  Certificate Issuer: Root-CA00000001")
+    elif ticket.signature_issuer.find("XS00000006") != 1:
+        print(f"  Certificate: XS00000006 (Development)")
+        print(f"  Certificate Issuer: Root-CA00000002")
+    else:
+        print(f"  Certificate Info: {ticket.signature_issuer}")
+    match ticket.common_key_index:
+        case 0:
+            key = "Common"
+        case 1:
+            key = "Korean"
+        case 2:
+            key = "vWii"
+        case _:
+            key = "Unknown (Likely Common)"
+    print(f"  Common Key: {key}")
+    print(f"  Title Key (Encrypted): {binascii.hexlify(ticket.title_key_enc).decode()}")
+    print(f"  Title Key (Decrypted): {binascii.hexlify(ticket.get_title_key()).decode()}")
+
+
+def _print_wad_info(title: libWiiPy.title.Title):
+    print(f"WAD Info")
+    match title.wad.wad_type:
+        case "Is":
+            print(f"  WAD Type: Standard Installable")
+        case "ib":
+            print(f"  WAD Type: boot2")
+        case _:
+            print(f"  WAD Type: Unknown ({title.wad.wad_type})")
+    print(f"  Has Meta/Footer: {bool(title.wad.wad_meta_size)}")
+    print(f"  Has CRL: {bool(title.wad.wad_crl_size)}")
+    print("")
+    _print_ticket_info(title.ticket)
+    print("")
+    _print_tmd_info(title.tmd)
+
+
+def handle_info(args):
+    input_path = pathlib.Path(args.input)
+
+    if not input_path.exists():
+        raise FileNotFoundError(input_path)
+
+    if input_path.suffix.lower() == ".tmd":
+        tmd = libWiiPy.title.TMD()
+        tmd.load(open(input_path, "rb").read())
+        _print_tmd_info(tmd)
+    elif input_path.suffix.lower() == ".tik":
+        tik = libWiiPy.title.Ticket()
+        tik.load(open(input_path, "rb").read())
+        _print_ticket_info(tik)
+    elif input_path.suffix.lower() == ".wad":
+        title = libWiiPy.title.Title()
+        title.load_wad(open(input_path, "rb").read())
+        _print_wad_info(title)
+    else:
+        raise TypeError("This does not appear to be a TMD, Ticket, or WAD! No info can be provided.")

modules/title/iospatcher.py

@@ -0,0 +1,129 @@
+# "modules/title/iospatcher.py" from WiiPy by NinjaCheetah
+# https://github.com/NinjaCheetah/WiiPy
+
+import pathlib
+import libWiiPy
+
+
+def _patch_fakesigning(ios_patcher: libWiiPy.title.IOSPatcher) -> int:
+    print("Applying fakesigning patch... ", end="", flush=True)
+    count = ios_patcher.patch_fakesigning()
+    if count == 1:
+        print(f"{count} patch applied")
+    else:
+        print(f"{count} patches applied")
+    return count
+
+
+def _patch_es_identify(ios_patcher: libWiiPy.title.IOSPatcher) -> int:
+    print("Applying ES_Identify access patch... ", end="", flush=True)
+    count = ios_patcher.patch_es_identify()
+    if count == 1:
+        print(f"{count} patch applied")
+    else:
+        print(f"{count} patches applied")
+    return count
+
+
+def _patch_nand_access(ios_patcher: libWiiPy.title.IOSPatcher) -> int:
+    print("Applying /dev/flash access patch... ", end="", flush=True)
+    count = ios_patcher.patch_nand_access()
+    if count == 1:
+        print(f"{count} patch applied")
+    else:
+        print(f"{count} patches applied")
+    return count
+
+
+def _patch_version_downgrading(ios_patcher: libWiiPy.title.IOSPatcher) -> int:
+    print("Applying version downgrading patch... ", end="", flush=True)
+    count = ios_patcher.patch_version_downgrading()
+    if count == 1:
+        print(f"{count} patch applied")
+    else:
+        print(f"{count} patches applied")
+    return count
+
+
+def _patch_drive_inquiry(ios_patcher: libWiiPy.title.IOSPatcher) -> int:
+    print("\n/!\\ WARNING! /!\\\n"
+          "This drive inquiry patch is experimental, and may introduce unexpected side effects on some consoles.\n")
+    print("Applying drive inquiry patch... ", end="", flush=True)
+    count = ios_patcher.patch_drive_inquiry()
+    if count == 1:
+        print(f"{count} patch applied")
+    else:
+        print(f"{count} patches applied")
+    return count
+
+
+def handle_iospatch(args):
+    input_path = pathlib.Path(args.input)
+    if not input_path.exists():
+        raise FileNotFoundError(input_path)
+
+    title = libWiiPy.title.Title()
+    title.load_wad(open(input_path, "rb").read())
+
+    tid = title.tmd.title_id
+    if tid[:8] != "00000001" or tid[8:] == "00000001" or tid[8:] == "00000002":
+        raise ValueError("This WAD does not appear to contain an IOS! Patching cannot continue.")
+
+    patch_count = 0
+
+    if args.version is not None:
+        title.set_title_version(args.version)
+        print(f"Title version set to {args.version}!")
+
+    if args.slot is not None:
+        slot = args.slot
+        if 3 <= slot <= 255:
+            tid = title.tmd.title_id[:-2] + f"{slot:02X}"
+            title.set_title_id(tid)
+            print(f"IOS slot set to {slot}!")
+
+    ios_patcher = libWiiPy.title.IOSPatcher()
+    ios_patcher.load(title)
+
+    if args.all is True:
+        patch_count += _patch_fakesigning(ios_patcher)
+        patch_count += _patch_es_identify(ios_patcher)
+        patch_count += _patch_nand_access(ios_patcher)
+        patch_count += _patch_version_downgrading(ios_patcher)
+    else:
+        if args.fakesigning is True:
+            patch_count += _patch_fakesigning(ios_patcher)
+        if args.es_identify is True:
+            patch_count += _patch_es_identify(ios_patcher)
+        if args.nand_access is True:
+            patch_count += _patch_nand_access(ios_patcher)
+        if args.version_downgrading is True:
+            patch_count += _patch_version_downgrading(ios_patcher)
+        if args.drive_inquiry is True:
+            patch_count += _patch_drive_inquiry(ios_patcher)
+
+    print(f"\nTotal patches applied: {patch_count}")
+
+    if patch_count == 0 and args.version is None and args.slot is None:
+        raise ValueError("No patches were applied! Please select patches to apply, and ensure that selected patches are"
+                         " compatible with this IOS.")
+
+    if patch_count > 0 or args.version is not None or args.slot is not None:
+        # Set patched content to non-shared if that argument was passed.
+        if args.no_shared:
+            ios_patcher.title.content.content_records[ios_patcher.es_module_index].content_type = 1
+            if ios_patcher.dip_module_index != -1:
+                ios_patcher.title.content.content_records[ios_patcher.dip_module_index].content_type = 1
+
+        ios_patcher.title.fakesign()  # Signature is broken anyway, so fakesign for maximum installation openings
+        if args.output is not None:
+            output_path = pathlib.Path(args.output)
+            output_file = open(output_path, "wb")
+            output_file.write(ios_patcher.title.dump_wad())
+            output_file.close()
+        else:
+            output_file = open(input_path, "wb")
+            output_file.write(ios_patcher.title.dump_wad())
+            output_file.close()
+
+    print("IOS successfully patched!")

modules/title/nus.py

@@ -1,4 +1,4 @@
-# "nus.py" from WiiPy by NinjaCheetah
+# "modules/title/nus.py" from WiiPy by NinjaCheetah
 # https://github.com/NinjaCheetah/WiiPy
 
 import os
@@ -112,10 +112,7 @@ def handle_nus_title(args):
                 print(" - Decrypting content " + str(content + 1) + " of " + str(len(title.tmd.content_records)) +
                       " (Content ID: " + str(title.tmd.content_records[content].content_id) + ")...")
                 dec_content = title.get_content_by_index(content)
-                content_file_name = hex(title.tmd.content_records[content].content_id)[2:]
-                while len(content_file_name) < 8:
-                    content_file_name = "0" + content_file_name
-                content_file_name = content_file_name + ".app"
+                content_file_name = f"{title.tmd.content_records[content].content_id:08X}".lower() + ".app"
                 dec_content_out = open(output_dir.joinpath(content_file_name), "wb")
                 dec_content_out.write(dec_content)
                 dec_content_out.close()
@@ -159,9 +156,7 @@ def handle_nus_content(args):
 
     # Use the supplied output path if one was specified, otherwise generate one using the Content ID.
     if out is None:
-        content_file_name = hex(content_id)[2:]
-        while len(content_file_name) < 8:
-            content_file_name = "0" + content_file_name
+        content_file_name = f"{content_id:08X}".lower()
         output_path = pathlib.Path(content_file_name)
     else:
         output_path = pathlib.Path(out)
@@ -223,3 +218,37 @@ def handle_nus_content(args):
         file.close()
 
     print("Downloaded content with Content ID \"" + cid + "\"!")
+
+
+def handle_nus_tmd(args):
+    tid = args.tid
+    version = args.version
+    out = args.output
+
+    # Check if --version was passed, because it'll be None if it wasn't.
+    if args.version is not None:
+        try:
+            title_version = int(args.version)
+        except ValueError:
+            print("Enter a valid integer for the Title Version.")
+            return
+
+    # Use the supplied output path if one was specified, otherwise generate one using the Title ID.
+    if out is None:
+        output_path = pathlib.Path(tid + ".tmd")
+    else:
+        output_path = pathlib.Path(out)
+
+    # Try to download the TMD, and catch the ValueError libWiiPy will throw if it can't be found.
+    print("Downloading TMD for title " + tid + "...")
+    try:
+        tmd_data = libWiiPy.title.download_tmd(tid, version)
+    except ValueError:
+        print("The Title ID or version you specified could not be found!")
+        return
+
+    file = open(output_path, "wb")
+    file.write(tmd_data)
+    file.close()
+
+    print("Downloaded TMD for title \"" + tid + "\"!")

modules/title/wad.py

@@ -1,10 +1,8 @@
-# "wad.py" from WiiPy by NinjaCheetah
+# "modules/title/wad.py" from WiiPy by NinjaCheetah
 # https://github.com/NinjaCheetah/WiiPy
 
 import os
 import pathlib
-import hashlib
-import binascii
 import libWiiPy
 
 
@@ -23,7 +21,7 @@ def handle_wad(args):
 
         # Get a list of all files ending in .tmd, and then make sure that that list has *only* 1 entry. More than 1
         # means we can't pack a WAD because we couldn't really tell which TMD is intended for this WAD.
-        tmd_list = list(input_path.glob('*.tmd'))
+        tmd_list = list(input_path.glob('*.[tT][mM][dD]'))
         if len(tmd_list) > 1:
             raise FileExistsError("More than one TMD file was found! Only one TMD can be packed into a WAD.")
         elif len(tmd_list) == 0:
@@ -32,7 +30,7 @@ def handle_wad(args):
             tmd_file = tmd_list[0]
 
         # Repeat the same process as above for all .tik files.
-        ticket_list = list(input_path.glob('*.tik'))
+        ticket_list = list(input_path.glob('*.[tT][iI][kK]'))
         if len(ticket_list) > 1:
             raise FileExistsError("More than one Ticket file was found! Only one Ticket can be packed into a WAD.")
         elif len(ticket_list) == 0:
@@ -41,7 +39,7 @@ def handle_wad(args):
             ticket_file = ticket_list[0]
 
         # And one more time for all .cert files.
-        cert_list = list(input_path.glob('*.cert'))
+        cert_list = list(input_path.glob('*.[cC][eE][rR][tT]'))
         if len(cert_list) > 1:
             raise FileExistsError("More than one certificate file was found! Only one certificate can be packed into a "
                                   "WAD.")
@@ -51,10 +49,18 @@ def handle_wad(args):
             cert_file = cert_list[0]
 
         # Make sure that there's at least one content to pack.
-        content_files = list(input_path.glob("*.app"))
+        content_files = list(input_path.glob("*.[aA][pP][pP]"))
         if not content_files:
             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(None)
+        for content_file in content_files:
+            content_index = int(content_file.stem, 16)
+            content_files_ordered[content_index] = content_file
+
         # Open the output file, and load all the component files that we've now verified we have into a libWiiPy Title()
         # object.
         with open(output_path, "wb") as output_path:
@@ -65,28 +71,22 @@ def handle_wad(args):
             title.wad.set_cert_data(open(cert_file, "rb").read())
             # Footers are not super common and are not required, so we don't care about one existing until we get to
             # the step where we'd pack it.
-            footer_file = list(input_path.glob("*.footer"))[0]
+            footer_file = list(input_path.glob("*.[fF][oO][oO][tT][eE][rR]"))[0]
             if footer_file.exists():
                 title.wad.set_meta_data(open(footer_file, "rb").read())
             # Method to ensure that the title's content records match between the TMD() and ContentRegion() objects.
             title.load_content_records()
 
+            # Iterate over every file in the content_files list, and set them in the Title().
+            for record in title.content.content_records:
+                index = title.content.content_records.index(record)
+                dec_content = open(content_files_ordered[index], "rb").read()
+                title.set_content(dec_content, index)
+
             # Fakesign the TMD and Ticket using the trucha bug, if enabled. This is built-in in libWiiPy v0.4.1+.
             if args.fakesign:
                 title.fakesign()
 
-            # Iterate over every file in the content_files list, and attempt to load it into the Title().
-            for index in range(len(title.content.content_records)):
-                for content in range(len(content_files)):
-                    dec_content = open(content_files[content], "rb").read()
-                    try:
-                        # Attempt to load the content into the correct index.
-                        title.load_content(dec_content, index)
-                        break
-                    except ValueError:
-                        # Wasn't the right content, so try again.
-                        pass
-
             output_path.write(title.dump_wad())
 
         print("WAD file packed!")
@@ -97,9 +97,9 @@ def handle_wad(args):
             raise FileNotFoundError(input_path)
         # Check if the output path already exists, and if it does, ensure that it is both a directory and empty.
         if output_path.exists():
-            if output_path.is_dir() and next(os.scandir(output_path), None):
-                raise ValueError("Output folder is not empty!")
-            elif output_path.is_file():
+            # if output_path.is_dir() and next(os.scandir(output_path), None):
+            #    raise ValueError("Output folder is not empty!")
+            if output_path.is_file():
                 raise ValueError("A file already exists with the provided directory name!")
         else:
             os.mkdir(output_path)
@@ -129,10 +129,16 @@ def handle_wad(args):
             meta_out.write(title.wad.get_meta_data())
             meta_out.close()
 
+            # Skip validating hashes if -s/--skip-hash was passed.
+            if args.skip_hash:
+                skip_hash = True
+            else:
+                skip_hash = False
+
             for content_file in range(0, title.tmd.num_contents):
-                content_file_name = "000000" + str(binascii.hexlify(content_file.to_bytes()).decode()) + ".app"
+                content_file_name = f"{content_file:08X}".lower() + ".app"
                 content_out = open(output_path.joinpath(content_file_name), "wb")
-                content_out.write(title.get_content_by_index(content_file))
+                content_out.write(title.get_content_by_index(content_file, skip_hash))
                 content_out.close()
 
         print("WAD file unpacked!")

requirements.txt

@@ -1,2 +1,2 @@
 git+https://github.com/NinjaCheetah/libWiiPy
-nuitka
+nuitka==2.3.11

scripts/content-checker.py

@@ -0,0 +1,27 @@
+import pathlib
+import sys
+
+import libWiiPy
+
+target_hash = sys.argv[1].lower().encode()
+print(target_hash)
+
+for content in range(3, 81):
+    try:
+        tmd = libWiiPy.title.download_tmd(f"00000007000000{content:02X}")
+        open(f"00000007000000{content:02X}.tmd", "wb").write(tmd)
+    except ValueError:
+        pass
+
+workdir = pathlib.Path(".")
+
+tmd_files = list(workdir.glob("*.tmd"))
+
+for tmd in tmd_files:
+    new_tmd = libWiiPy.title.TMD()
+    new_tmd.load(open(tmd, "rb").read())
+    hash_list = []
+    for content in new_tmd.content_records:
+        hash_list.append(content.content_hash)
+    if target_hash in hash_list:
+        print(f"Found match in {tmd}\n")

scripts/nus-scraper.py

@@ -0,0 +1,28 @@
+import os
+
+import libWiiPy
+
+tid_high = ["00010000", "00010001", "00010005"]
+types = ["43", "44", "45", "46", "47", "48", "4A", "4C", "4D", "4E", "50", "51", "52", "53", "57", "58"]
+regions = ["45", "4A", "4B", "50"]
+
+
+for tid in tid_high:
+    print(f"Starting scrape for TID high {tid}...")
+
+    if os.path.exists(f"{tid}.log"):
+        os.remove(f"{tid}.log")
+    log = open(f"{tid}.log", "a")
+
+    for ttype in types:
+        print(f"Scraping titles of type: {ttype}")
+        for title in range(0, 65536):
+            for region in regions:
+                try:
+                    tmd = libWiiPy.title.download_tmd(f"{tid}{ttype}{title:04X}{region}")
+                    print(f"Found valid TID: {tid}{ttype}{title:04X}{region}")
+                    log.write(f"{tid}{ttype}{title:02X}{region}")
+                except ValueError:
+                    print(f"Invalid TID: {tid}{ttype}{title:04X}{region}")
+                    pass
+    log.close()

wiipy.py

@@ -4,30 +4,91 @@
 import argparse
 from importlib.metadata import version
 
-from modules.wad import *
-from modules.nus import *
-from modules.u8 import *
-from modules.ash import *
+from modules.archive.ash import *
+from modules.archive.u8 import *
+from modules.title.emunand import *
+from modules.title.fakesign import *
+from modules.title.info import *
+from modules.title.iospatcher import *
+from modules.title.nus import *
+from modules.title.wad import *
 
 if __name__ == "__main__":
     # Main argument parser.
     parser = argparse.ArgumentParser(
-        description="WiiPy is a simple command line tool to manage file formats used by the Wii.")
+        description="A simple command line tool to manage file formats used by the Wii.")
     parser.add_argument("--version", action="version",
-                        version=f"WiiPy v1.2.1, based on libWiiPy v{version('libWiiPy')} (from branch \'main\')")
-    subparsers = parser.add_subparsers(dest="subcommand", required=True)
+                        version=f"WiiPy v1.3.0, based on libWiiPy v{version('libWiiPy')} (from branch \'main\')")
+    subparsers = parser.add_subparsers(title="subcommands", dest="subcommand", required=True)
 
-    # Argument parser for the WAD subcommand.
-    wad_parser = subparsers.add_parser("wad", help="pack/unpack a WAD file",
-                                       description="pack/unpack a WAD file")
-    wad_parser.set_defaults(func=handle_wad)
-    wad_group = wad_parser.add_mutually_exclusive_group(required=True)
-    wad_group.add_argument("-p", "--pack", help="pack a directory to a WAD file", action="store_true")
-    wad_group.add_argument("-u", "--unpack", help="unpack a WAD file to a directory", action="store_true")
-    wad_parser.add_argument("input", metavar="IN", type=str, help="input file")
-    wad_parser.add_argument("output", metavar="OUT", type=str, help="output file")
-    wad_parser.add_argument("--fakesign", help="fakesign the TMD and Ticket (trucha bug)",
-                            action="store_true")
+    # Argument parser for the ASH subcommand.
+    ash_parser = subparsers.add_parser("ash", help="compress/decompress an ASH file",
+                                       description="compress/decompress an ASH file")
+    ash_parser.set_defaults(func=handle_ash)
+    ash_group = ash_parser.add_mutually_exclusive_group(required=True)
+    ash_group.add_argument("-c", "--compress", help="compress a file into an ASH file", action="store_true")
+    ash_group.add_argument("-d", "--decompress", help="decompress an ASH file", action="store_true")
+    ash_parser.add_argument("input", metavar="IN", type=str, help="input file")
+    ash_parser.add_argument("output", metavar="OUT", type=str, help="output file")
+    ash_parser.add_argument("--sym-bits", metavar="SYM_BITS", type=int,
+                            help="number of bits in each symbol tree leaf (default: 9)", default=9)
+    ash_parser.add_argument("--dist-bits", metavar="DIST_BITS", type=int,
+                            help="number of bits in each distance tree leaf (default: 11)", default=11)
+
+    # Argument parser for the EmuNAND subcommand.
+    emunand_parser = subparsers.add_parser("emunand", help="manage Wii EmuNAND directories",
+                                           description="manage Wii EmuNAND directories")
+    emunand_subparsers = emunand_parser.add_subparsers(title="emunand", dest="emunand", required=True)
+    # Title EmuNAND subcommand.
+    emunand_title_parser = emunand_subparsers.add_parser("title", help="manage titles on an EmuNAND",
+                                                         description="manage titles on an EmuNAND")
+    emunand_title_parser.set_defaults(func=handle_emunand_title)
+    emunand_title_parser.add_argument("emunand", metavar="EMUNAND", type=str,
+                                      help="path to the target EmuNAND directory")
+    emunand_title_install_group = emunand_title_parser.add_mutually_exclusive_group(required=True)
+    emunand_title_install_group.add_argument("--install", metavar="WAD", type=str,
+                                             help="install the target WAD(s) to an EmuNAND (can be a single file or a "
+                                                  "folder of WADs)")
+    emunand_title_install_group.add_argument("--uninstall", metavar="TID", type=str,
+                                             help="uninstall a title with the provided Title ID from an EmuNAND (also"
+                                                  "accepts a WAD file to read the TID from)")
+    emunand_title_parser.add_argument("-s", "--skip-hash", help="skips validating the hashes of decrypted "
+                                      "content (install only)", action="store_true")
+
+    # Argument parser for the fakesign subcommand.
+    fakesign_parser = subparsers.add_parser("fakesign", help="fakesign a TMD, Ticket, or WAD (trucha bug)",
+                                            description="fakesign a TMD, Ticket, or WAD (trucha bug); by default, this "
+                                                        "will overwrite the input file if no output file is specified")
+    fakesign_parser.set_defaults(func=handle_fakesign)
+    fakesign_parser.add_argument("input", metavar="IN", type=str, help="input file")
+    fakesign_parser.add_argument("-o", "--output", metavar="OUT", type=str, help="output file (optional)")
+
+    # Argument parser for the info command.
+    info_parser = subparsers.add_parser("info", help="get information about a TMD, Ticket, or WAD",
+                                        description="get information about a TMD, Ticket, or WAD")
+    info_parser.set_defaults(func=handle_info)
+    info_parser.add_argument("input", metavar="IN", type=str, help="input file")
+
+    # Argument parser for the iospatch command.
+    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"
+                                                        "overwrite the input file in place unless you use -o/--output")
+    iospatch_parser.set_defaults(func=handle_iospatch)
+    iospatch_parser.add_argument("input", metavar="IN", type=str, help="input file")
+    iospatch_parser.add_argument("-o", "--output", metavar="OUT", type=str, help="output file (optional)")
+    iospatch_parser.add_argument("-fs", "--fakesigning", action="store_true", help="patch in fakesigning support")
+    iospatch_parser.add_argument("-ei", "--es-identify", action="store_true", help="patch in ES_Identify access")
+    iospatch_parser.add_argument("-na", "--nand-access", action="store_true", help="patch in /dev/flash access")
+    iospatch_parser.add_argument("-vd", "--version-downgrading", action="store_true",
+                                 help="patch in version downgrading support")
+    iospatch_parser.add_argument("-di", "--drive-inquiry", action="store_true",
+                                 help="patches out the drive inquiry check")
+    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,
+                                 help="set the slot that this IOS will install to")
+    iospatch_parser.add_argument("-a", "--all", action="store_true", help="apply all patches (overrides other options)")
+    iospatch_parser.add_argument("-ns", "--no-shared", action="store_true",
+                                 help="set all patched content to be non-shared")
 
     # Argument parser for the NUS subcommand.
     nus_parser = subparsers.add_parser("nus", help="download data from the NUS",
@@ -60,6 +121,14 @@ if __name__ == "__main__":
     nus_content_parser.add_argument("-o", "--output", metavar="OUT", type=str,
                                     help="path to download the content to (optional)")
     nus_content_parser.add_argument("-d", "--decrypt", action="store_true", help="decrypt this content")
+    # TMD NUS subcommand.
+    nus_tmd_parser = nus_subparsers.add_parser("tmd", help="download a tmd from the NUS",
+                                               description="download a tmd from the NUS")
+    nus_tmd_parser.set_defaults(func=handle_nus_tmd)
+    nus_tmd_parser.add_argument("tid", metavar="TID", type=str, help="Title ID the TMD is for")
+    nus_tmd_parser.add_argument("-v", "--version", metavar="VERSION", type=int, help="version of the TMD to download")
+    nus_tmd_parser.add_argument("-o", "--output", metavar="OUT", type=str,
+                                help="path to download the TMD to (optional)")
 
     # Argument parser for the U8 subcommand.
     u8_parser = subparsers.add_parser("u8", help="pack/unpack a U8 archive",
@@ -71,19 +140,21 @@ if __name__ == "__main__":
     u8_parser.add_argument("input", metavar="IN", type=str, help="input file")
     u8_parser.add_argument("output", metavar="OUT", type=str, help="output file")
 
-    # Argument parser for the ASH subcommand.
-    ash_parser = subparsers.add_parser("ash", help="compress/decompress an ASH file",
-                                       description="compress/decompress an ASH file")
-    ash_parser.set_defaults(func=handle_ash)
-    ash_group = ash_parser.add_mutually_exclusive_group(required=True)
-    ash_group.add_argument("-c", "--compress", help="compress a file into an ASH file", action="store_true")
-    ash_group.add_argument("-d", "--decompress", help="decompress an ASH file", action="store_true")
-    ash_parser.add_argument("input", metavar="IN", type=str, help="input file")
-    ash_parser.add_argument("output", metavar="OUT", type=str, help="output file")
-    ash_parser.add_argument("--sym-bits", metavar="SYM_BITS", type=int,
-                            help="number of bits in each symbol tree leaf (default: 9)", default=9)
-    ash_parser.add_argument("--dist-bits", metavar="DIST_BITS", type=int,
-                            help="number of bits in each distance tree leaf (default: 11)", default=11)
+    # Argument parser for the WAD subcommand.
+    wad_parser = subparsers.add_parser("wad", help="pack/unpack a WAD file",
+                                       description="pack/unpack a WAD file")
+    wad_parser.set_defaults(func=handle_wad)
+    wad_group = wad_parser.add_mutually_exclusive_group(required=True)
+    wad_group.add_argument("-p", "--pack", help="pack a directory to a WAD file", action="store_true")
+    wad_group.add_argument("-u", "--unpack", help="unpack a WAD file to a directory", action="store_true")
+    wad_parser.add_argument("input", metavar="IN", type=str, help="input file")
+    wad_parser.add_argument("output", metavar="OUT", type=str, help="output file")
+    wad_pack_group = wad_parser.add_argument_group(title="packing options")
+    wad_pack_group.add_argument("-f", "--fakesign", help="fakesign the TMD and Ticket (trucha bug)",
+                                action="store_true")
+    wad_unpack_group = wad_parser.add_argument_group(title="unpacking options")
+    wad_unpack_group.add_argument("-s", "--skip-hash", help="skips validating the hashes of decrypted "
+                                  "content", action="store_true")
 
     # Parse all the args, and call the appropriate function with all of those args if a valid subcommand was passed.
     args = parser.parse_args()