diff --git a/modules/nus.py b/modules/nus.py index f0ee122..d129725 100644 --- a/modules/nus.py +++ b/modules/nus.py @@ -106,20 +106,21 @@ def handle_nus_title(args): title.content.content_list = content_list # Try to decrypt the contents for this title if a ticket was available. - if can_decrypt is True and output_dir is not None: - for content in range(len(title.tmd.content_records)): - 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" - dec_content_out = open(output_dir.joinpath(content_file_name), "wb") - dec_content_out.write(dec_content) - dec_content_out.close() - else: - print("Title has no Ticket, so content will not be decrypted!") + if output_dir is not None: + if can_decrypt is True: + for content in range(len(title.tmd.content_records)): + 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" + dec_content_out = open(output_dir.joinpath(content_file_name), "wb") + dec_content_out.write(dec_content) + dec_content_out.close() + else: + print("Title has no Ticket, so content will not be decrypted!") # If --wad was passed, pack a WAD and output that. if wad_file is not None: diff --git a/wiipy.py b/wiipy.py index 0daa531..f952674 100644 --- a/wiipy.py +++ b/wiipy.py @@ -14,7 +14,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser( description="WiiPy is a simple command line tool to manage file formats used by the Wii.") parser.add_argument("--version", action="version", - version=f"WiiPy v1.2.0, based on libWiiPy v{version('libWiiPy')} (from branch \'main\')") + version=f"WiiPy v1.2.1, based on libWiiPy v{version('libWiiPy')} (from branch \'main\')") subparsers = parser.add_subparsers(dest="subcommand", required=True) # Argument parser for the WAD subcommand.