@@ -106,22 +106,23 @@ def _print_ticket_info(ticket: libWiiPy.title.Ticket, signing_cert=None):
106106 # Get all important keys from the TMD and print them out nicely.
107107 print (f"Ticket Info" )
108108 ascii_tid = ""
109+ decoded_tid = binascii .hexlify (ticket .title_id ).decode ()
109110 try :
110- ascii_tid = str (bytes .fromhex (binascii . hexlify ( ticket . title_id ). decode () [8 :].replace ("00" , "30" )).decode ("ascii" ))
111- except UnicodeDecodeError or binascii . Error :
111+ ascii_tid = str (bytes .fromhex (decoded_tid [8 :].replace ("00" , "30" )).decode ("ascii" ))
112+ except UnicodeDecodeError :
112113 pass
113114 pattern = r"^[a-z0-9!@#$%^&*]{4}$"
114115 if re .fullmatch (pattern , ascii_tid , re .IGNORECASE ):
115- print (f" Title ID: { binascii . hexlify ( ticket . title_id ). decode () .upper ()} ({ ascii_tid } )" )
116+ print (f" Title ID: { decoded_tid .upper ()} ({ ascii_tid } )" )
116117 else :
117- print (f" Title ID: { binascii . hexlify ( ticket . title_id ). decode () .upper ()} " )
118+ print (f" Title ID: { decoded_tid .upper ()} " )
118119 # This type of version number really only applies to the System Menu and IOS.
119- if ticket . title_id . decode () .startswith ("00000001" ):
120- if ticket . title_id . decode () == "0000000100000001" :
120+ if decoded_tid .startswith ("00000001" ):
121+ if decoded_tid == "0000000100000001" :
121122 print (f" Title Version: { ticket .title_version } (boot2v{ ticket .title_version } )" )
122123 else :
123124 print (f" Title Version: { ticket .title_version } "
124- f"({ libWiiPy .title .title_ver_dec_to_standard (ticket .title_version , ticket . title_id . decode () )} )" )
125+ f"({ libWiiPy .title .title_ver_dec_to_standard (ticket .title_version , decoded_tid )} )" )
125126 else :
126127 print (f" Title Version: { ticket .title_version } " )
127128 print (f" Ticket Version: { ticket .ticket_version } " )
0 commit comments